fixed catch exception when looking for remote ip address
authorCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Tue, 14 Apr 2015 13:16:09 +0000 (15:16 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 16 Apr 2015 09:01:44 +0000 (11:01 +0200)
activity/__init__.py

index 4719a61..7038181 100644 (file)
@@ -83,10 +83,10 @@ def log(request, action, message, objects = None):
     t.start()
 
 def getClientIp(request):
-    x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
-    if x_forwarded_for:
+    try :
+        x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
         ip = x_forwarded_for.split(',')[0]
-    else:
+    except:
         ip = request.META.get('REMOTE_ADDR')
     return ip