[Erp5-report] r13404 - in /erp5/trunk/products/CMFActivity/Activity: SQLDict.py SQLQueue.py

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Mar 13 15:25:18 2007
New Revision: 13404

URL: http://svn.erp5.org?rev=13404&view=rev
Log:
if a error happen in ActivityTool.invoke or around, the message will immediatly
be put in INVOKE_ERROR_STATE, but we will LOG a traceback (maybe we should
also call notifyUser).
remove the obsolete comment "what happens if read conflict error restarts
transaction", because this is handled explicitly here.


Modified:
    erp5/trunk/products/CMFActivity/Activity/SQLDict.py
    erp5/trunk/products/CMFActivity/Activity/SQLQueue.py

Modified: erp5/trunk/products/CMFActivity/Activity/SQLDict.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/Activity/SQLDict.py?rev=13404&r1=13403&r2=13404&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLDict.py (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLDict.py Tue Mar 13 15:25:18 2007
@@ -326,6 +326,8 @@
             if len(uid_list):
               activity_tool.SQLDict_assignMessage(uid = uid_list, 
                                                   processing_node = INVOKE_ERROR_STATE)
+              LOG('SQLDict', WARNING, 'Error in ActivityTool.invoke', e=sys.exc_info())
+
         get_transaction().commit()
         return 0
 

Modified: erp5/trunk/products/CMFActivity/Activity/SQLQueue.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/Activity/SQLQueue.py?rev=13404&r1=13403&r2=13404&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLQueue.py (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLQueue.py Tue Mar 13 15:25:18 2007
@@ -122,7 +122,7 @@
           return 0
 
         # Try to invoke
-        activity_tool.invoke(m) # Try to invoke the message - what happens if read conflict error restarts transaction ?
+        activity_tool.invoke(m) # Try to invoke the message
         if m.is_executed:                                          # Make sure message could be invoked
           get_transaction().commit()                                        # If successful, commit
       except:
@@ -142,6 +142,8 @@
           # For the other exceptions, put it into an error state.
           activity_tool.SQLQueue_assignMessage(uid = line.uid, 
                                                processing_node = INVOKE_ERROR_STATE)
+          LOG('SQLQueue', WARNING, 'Error in ActivityTool.invoke', e=sys.exc_info())
+
         get_transaction().commit()
         return 0