From 0be3cf98ec259d66a8c52163d433c869bb39a6b1 Mon Sep 17 00:00:00 2001 From: Ciro Scognamiglio Date: Fri, 3 Oct 2014 16:45:50 +0200 Subject: [PATCH] log testbed and facility --- activity/__init__.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/activity/__init__.py b/activity/__init__.py index 6157bae7..15b4e066 100644 --- a/activity/__init__.py +++ b/activity/__init__.py @@ -56,14 +56,15 @@ def logWrite(request, action, message, objects = None): "apikey" : apikey, "signature" : sign(secret, "%s%s%s%s" % (timestamp, ip, request.user, action)), "slice" : None, - "resource" : None + "resource" : None, + "resource_type" : None, + "facility" : None, + "testbed" : None, } - if objects and 'slice' in objects : - log['slice'] = objects['slice'] - - if objects and 'resource' in objects : - log['resource'] = objects['resource'] + for o in objects : + if (o in log) : + log[o] = objects[o] try : result = urllib2.urlopen(server, urllib.urlencode(log)) @@ -71,6 +72,7 @@ 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 def log(request, action, message, objects = None): # Create a new thread in Daemon mode to send the log entry -- 2.43.0