[Erp5-report] r14153 - in /erp5/trunk/products/CMFActivity: Activity/ skins/activity/
nobody at svn.erp5.org
nobody at svn.erp5.org
Sun Apr 22 01:15:22 CEST 2007
Author: yo
Date: Sun Apr 22 01:15:20 2007
New Revision: 14153
URL: http://svn.erp5.org?rev=14153&view=rev
Log:
Set processing_node in SQLDict_processMessage, so that the processing states of messages are reset correctly when Zope is restarted.
Modified:
erp5/trunk/products/CMFActivity/Activity/SQLDict.py
erp5/trunk/products/CMFActivity/skins/activity/SQLDict_processMessage.zsql
Modified: erp5/trunk/products/CMFActivity/Activity/SQLDict.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/Activity/SQLDict.py?rev=14153&r1=14152&r2=14153&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLDict.py (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLDict.py Sun Apr 22 01:15:20 2007
@@ -181,7 +181,8 @@
# Make sure message can not be processed anylonger
if len(uid_list) > 0:
# Set selected messages to processing
- activity_tool.SQLDict_processMessage(uid=uid_list)
+ activity_tool.SQLDict_processMessage(uid=uid_list,
+ processing_node=processing_node)
get_transaction().commit() # Release locks before starting a potentially long calculation
# This may lead (1 for 1,000,000 in case of reindexing) to messages left in processing state
@@ -228,7 +229,8 @@
uid_list = [x.uid for x in uid_list]
if len(uid_list) > 0:
# Set selected messages to processing
- activity_tool.SQLDict_processMessage(uid=uid_list)
+ activity_tool.SQLDict_processMessage(uid=uid_list,
+ processing_node=processing_node)
get_transaction().commit() # Release locks before starting a potentially long calculation
# Save this newly marked uids as soon as possible.
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLDict_processMessage.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLDict_processMessage.zsql?rev=14153&r1=14152&r2=14153&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLDict_processMessage.zsql (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLDict_processMessage.zsql Sun Apr 22 01:15:20 2007
@@ -7,11 +7,13 @@
class_name:
class_file:
</dtml-comment>
-<params>uid</params>
+<params>uid
+processing_node</params>
UPDATE message
SET
processing_date = <dtml-sqlvar "_.DateTime()" type="datetime">,
- processing = 1
+ processing = 1,
+ processing_node = <dtml-sqlvar processing_node type="int">
WHERE
uid IN (
<dtml-in uid><dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>
More information about the Erp5-report
mailing list