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
Smartfire: updated several templates
[myslice.git]
/
activity
/
__init__.py
diff --git
a/activity/__init__.py
b/activity/__init__.py
index
4719a61
..
b749672
100644
(file)
--- a/
activity/__init__.py
+++ b/
activity/__init__.py
@@
-14,6
+14,8
@@
import base64
import time
import datetime
from myslice.configengine import ConfigEngine
import time
import datetime
from myslice.configengine import ConfigEngine
+from myslice.settings import logger
+
config = ConfigEngine()
if config.activity and config.activity.apikey :
config = ConfigEngine()
if config.activity and config.activity.apikey :
@@
-37,10
+39,10
@@
else :
def logWrite(request, action, message, objects = None):
if not apikey :
def logWrite(request, action, message, objects = None):
if not apikey :
- print "===============>> activity: no apikey"
+ logger.info("===============>> activity: no apikey")
return
if not secret :
return
if not secret :
- print "===============>> activity: no secret"
+ logger.info("===============>> activity: no secret")
return
timestamp = time.mktime(datetime.datetime.today().timetuple())
return
timestamp = time.mktime(datetime.datetime.today().timetuple())
@@
-69,12
+71,11
@@
def logWrite(request, action, message, objects = None):
try :
result = urllib2.urlopen(server, urllib.urlencode(log))
try :
result = urllib2.urlopen(server, urllib.urlencode(log))
-
print "===============>> activity: %s <%s> %s" % (action, request.user,message
)
+
logger.info("===============>> activity: {} <{}> {}".format(action, request.user,message)
)
content = result.read()
except urllib2.URLError as e:
content = result.read()
except urllib2.URLError as e:
- print "===============>> activity: connection to " + server + " impossible, could not log action"
- print e.strerror
- print ""
+ logger.error("===============>> activity: connection to {} impossible, could not log action".format(server))
+ logger.error(e.strerror)
def log(request, action, message, objects = None):
# Create a new thread in Daemon mode to send the log entry
def log(request, action, message, objects = None):
# Create a new thread in Daemon mode to send the log entry
@@
-83,14
+84,14
@@
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
#
# sign the request with the secret key
def sign(secret, message):
ip = request.META.get('REMOTE_ADDR')
return ip
#
# sign the request with the secret key
def sign(secret, message):
- return hmac.new(secret, msg=message, digestmod=hashlib.sha256).hexdigest()
\ No newline at end of file
+ return hmac.new(secret, msg=message, digestmod=hashlib.sha256).hexdigest()