fixed catch exception when looking for remote ip address

[unfold.git] / activity / __init__.py

diff --git a/activity/__init__.py b/activity/__init__.py
index d2a9e94..7038181 100644 (file)
--- a/activity/__init__.py
+++ b/activity/__init__.py
@@ -62,9 +62,10 @@ def logWrite(request, action, message, objects = None):
         "testbed"       : None,
     }
     
-    for o in objects :
-        if (o in log) :
-            log[o] = objects[o]
+    if objects is not None:
+        for o in objects :
+            if (o in log) :
+                log[o] = objects[o]
     
     try :
         result = urllib2.urlopen(server, urllib.urlencode(log))
@@ -72,7 +73,8 @@ def logWrite(request, action, message, objects = None):
         content = result.read()
     except urllib2.URLError as e:
         print "===============>> activity: connection to " + server + " impossible, could not log action"
-        print "==>> " + e.strerror
+        print e.strerror
+        print ""
 
 def log(request, action, message, objects = None):
     # Create a new thread in Daemon mode to send the log entry
@@ -81,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