X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=activity%2F__init__.py;h=70381819c022c7d774e8c8c8f4aeaf8e45fdd43d;hb=534f2abeda7d18495594bc290f1f7e0135b0c300;hp=2478d6b4214cbd1f168d6c888468fba63203cceb;hpb=c5adfb90dff455211eff0b88ba9eed52f31a7ee4;p=unfold.git diff --git a/activity/__init__.py b/activity/__init__.py index 2478d6b4..70381819 100644 --- a/activity/__init__.py +++ b/activity/__init__.py @@ -73,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 @@ -82,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