X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethod.py;h=70b8b21496f46a394705332d2e3ca78631e4e7b4;hb=c292f0b768fcaa05218cf5ffdda5672e6ea9ffe6;hp=976dfe1776112ce3ca28a9d98c72f36d85c5c637;hpb=b0ac4d1dbd0c54de97dfd695258811cfb16cd3aa;p=plcapi.git

diff --git a/PLC/Method.py b/PLC/Method.py
index 976dfe1..70b8b21 100644
--- a/PLC/Method.py
+++ b/PLC/Method.py
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: Method.py,v 1.19 2006/11/29 17:57:27 tmack Exp $
+# $Id: Method.py,v 1.21 2007/01/16 17:04:08 mlhuang Exp $
 #
 
 import xmlrpclib
@@ -92,7 +92,7 @@ class Method:
 	    result = self.call(*args, **kwds)
 	    runtime = time.time() - start
 
-            if self.api.config.PLC_API_DEBUG:
+            if self.api.config.PLC_API_DEBUG or hasattr(self, 'message'):
 		self.log(0, runtime, *args)
 	    	
 	    return result
@@ -139,17 +139,19 @@ class Method:
 
         event.sync(commit = False)
 
-        # XXX object_ids is currently defined as a class variable
         if hasattr(self, 'object_ids'):
             for object_id in self.object_ids:
                 event.add_object(object_id, commit = False)
 
-	# Get message for this event
+	# Set the message for this event
 	if hasattr(self, 'message'):
-		event['message'] = self.message	
+            event['message'] = self.message	
 	
+	if hasattr(self, 'object_type'):
+	   event['object_type'] = self.object_type
+
         # Commit
-        event.sync(commit = True)
+        event.sync()
 
     def help(self, indent = "  "):
         """