From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Wed, 17 Nov 2010 21:21:01 +0000 (-0500)
Subject: handle KeyError exception for now
X-Git-Tag: plcapi-5.0-19~56^2~3^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6316c45df2f2a545d003d6ec51bba05e4b0f6bad;p=plcapi.git

handle KeyError exception for now
---

diff --git a/aspects/ratelimitaspects.py b/aspects/ratelimitaspects.py
index 07ccfc6..dbe0242 100644
--- a/aspects/ratelimitaspects.py
+++ b/aspects/ratelimitaspects.py
@@ -40,13 +40,18 @@ class BaseRateLimit(object):
 
         api_method_name = wobj.name
         api_method_source = wobj.source
-        api_method_caller = args[0]["Username"]
+
+        # FIXME: Support  SessionAuth, GPGAuth, BootAuth and AnonymousAuth
+        try:
+            api_method_caller = args[0]["Username"]
+        except KeyError:
+            api_method_caller = "_"
 
         if api_method_source == None or api_method_source[0] == self.config.PLC_API_IP or api_method_source[0] in self.whitelist:
             return
 
         if api_method_caller == None:
-            self.log("%s called with Username = None" % api_method_source[0])
+            self.log("%s called from %s with Username = None" % (api_method_name, api_method_source[0]))
             return
 
         mc = memcache.Client(["%s:11211" % self.config.PLC_API_HOST])