git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed catch exception when looking for remote ip address
[myslice.git]
/
activity
/
__init__.py
diff --git
a/activity/__init__.py
b/activity/__init__.py
index
4719a61
..
7038181
100644
(file)
--- a/
activity/__init__.py
+++ b/
activity/__init__.py
@@
-83,10
+83,10
@@
def log(request, action, message, objects = None):
t.start()
def getClientIp(request):
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]
ip = x_forwarded_for.split(',')[0]
- e
lse
:
+ e
xcept
:
ip = request.META.get('REMOTE_ADDR')
return ip
ip = request.META.get('REMOTE_ADDR')
return ip