From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Tue, 16 Jan 2007 17:04:08 +0000 (+0000)
Subject: - log event if .message attribute is set
X-Git-Tag: pycurl-7_13_1~102
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6133026e519d0412d1151cb9272ad6bde0abd18e;p=plcapi.git

- log event if .message attribute is set
---

diff --git a/PLC/Method.py b/PLC/Method.py
index 976dfe1..e2250ea 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.20 2006/12/20 14:08:40 tmack 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,16 @@ 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	
 	
         # Commit
-        event.sync(commit = True)
+        event.sync()
 
     def help(self, indent = "  "):
         """