log testbed and facility

diff --git a/activity/__init__.py b/activity/__init__.py
index 6157bae..15b4e06 100644 (file)
--- 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