log testbed and facility

[myslice.git] / activity / __init__.py

diff --git a/activity/__init__.py b/activity/__init__.py
index 677424f..dfb7007 100644 (file)
--- a/activity/__init__.py
+++ b/activity/__init__.py
@@ -31,10 +31,10 @@ else :
 if config.activity and config.activity.server :
     server = config.activity.server
 else :
-    # secret will be necessary
-    server = "http://athos.ipv6.lip6.fr/log"
+    # default log server
+    server = "http://athos.ipv6.lip6.fr/activity/push/log"
 
-def logWrite(request, action, message):
+def logWrite(request, action, message, objects = None):
     
     if not apikey :
         print "===============>> activity: no apikey"
@@ -54,17 +54,29 @@ def logWrite(request, action, message):
         "action"    : action,
         "message"   : message,
         "apikey"    : apikey,
-        "signature" : sign(secret, "%s%s%s%s" % (timestamp, ip, request.user, action))
+        "signature" : sign(secret, "%s%s%s%s" % (timestamp, ip, request.user, action)),
+        "slice"     : None,
+        "resource"  : None,
+        "resource_type"     : None,
+        "facility"      : None,
+        "testbed"       : None,
     }
+    
+    for o in objects :
+        if (o in log) :
+            log[o] = objects[o]
+    
     try :
         result = urllib2.urlopen(server, urllib.urlencode(log))
+        print "===============>> activity: %s <%s> " % (action, request.user,message)
         content = result.read()
     except urllib2.URLError as e:
-        print "Warning: connection to " + url + " impossible, could not log action"
+        print "===============>> activity: connection to " + server + " impossible, could not log action"
+        print "==>> " + e.strerror
 
-def log(request, action, message):
+def log(request, action, message, objects = None):
     # Create a new thread in Daemon mode to send the log entry
-    t = threading.Thread(target=logWrite, args=(request, action, message))
+    t = threading.Thread(target=logWrite, args=(request, action, message, objects))
     t.setDaemon(True)
     t.start()