From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Mon, 6 Dec 2010 20:30:51 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/plcapi
X-Git-Tag: plcapi-5.0-23~1^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=79804af429d6b019b8427372213f733684c6981a;hp=6d1d60c9c2620e2fd725590a981537ea6f580994;p=plcapi.git

Merge branch 'master' of ssh://git.planet-lab.org/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)