From: Thierry Parmentelat Date: Tue, 7 Dec 2010 15:25:13 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi X-Git-Tag: plcapi-5.0-23~1 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=35fbb0b42f864cff0ae56b36a9f53155d9aca2e3;hp=8c952d8a400d444d40b8613f0db25f997162f214;p=plcapi.git Merge branch 'master' of ssh://git.onelab.eu/git/plcapi --- diff --git a/aspects/ratelimitaspects.py b/aspects/ratelimitaspects.py index e95764f..5aeaa86 100644 --- a/aspects/ratelimitaspects.py +++ b/aspects/ratelimitaspects.py @@ -123,8 +123,11 @@ Subject: %(subject)s keys_to_check = ["%s_%s_%s_%s" % (self.prefix, api_method_caller, api_method_source[0], (now - timedelta(minutes = minute)).strftime("%Y%m%d%H%M")) for minute in range(self.minutes + 1)] try: - mc.incr(current_key) + value = mc.incr(current_key) except ValueError: + value = None + + if value == None: mc.set(current_key, 1, time=self.expire_after) results = mc.get_multi(keys_to_check)