move limits to toplevel of warcprox-meta json object

This commit is contained in:
Noah Levitt 2015-08-07 18:34:50 +00:00
parent a876152026
commit 89e5991f7b
2 changed files with 4 additions and 5 deletions

View File

@ -395,7 +395,7 @@ def test_dedup_https(https_daemon, warcprox_, archiving_proxies, playback_proxie
def test_limits(http_daemon, archiving_proxies):
url = 'http://localhost:{}/a/b'.format(http_daemon.server_port)
request_meta = {"stats":{"buckets":["job1"],"limits":{"job1.total.urls":10}}}
request_meta = {"stats":{"buckets":["job1"]},"limits":{"job1.total.urls":10}}
headers = {"Warcprox-Meta": json.dumps(request_meta)}
for i in range(10):

View File

@ -157,10 +157,9 @@ class WarcProxyHandler(warcprox.mitmproxy.MitmProxyHandler):
logger = logging.getLogger("warcprox.warcprox.WarcProxyHandler")
def _enforce_limits(self, warcprox_meta):
if (warcprox_meta and "stats" in warcprox_meta
and "limits" in warcprox_meta["stats"]):
# self.logger.info("warcprox_meta['stats']['limits']=%s", warcprox_meta['stats']['limits'])
for item in warcprox_meta["stats"]["limits"].items():
if (warcprox_meta and "limits" in warcprox_meta):
# self.logger.info("warcprox_meta['limits']=%s", warcprox_meta['limits'])
for item in warcprox_meta["limits"].items():
key, limit = item
bucket0, bucket1, bucket2 = key.rsplit(".", 2)
value = self.server.stats_db.value(bucket0, bucket1, bucket2)