From 89e5991f7b90e280612e34d04628dca5acfb3be3 Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Fri, 7 Aug 2015 18:34:50 +0000 Subject: [PATCH] move limits to toplevel of warcprox-meta json object --- warcprox/tests/test_warcprox.py | 2 +- warcprox/warcproxy.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/warcprox/tests/test_warcprox.py b/warcprox/tests/test_warcprox.py index 3b05a56..62b3553 100755 --- a/warcprox/tests/test_warcprox.py +++ b/warcprox/tests/test_warcprox.py @@ -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): diff --git a/warcprox/warcproxy.py b/warcprox/warcproxy.py index 91891d1..d0d4c97 100644 --- a/warcprox/warcproxy.py +++ b/warcprox/warcproxy.py @@ -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)