[Erp5-report] r17874 - /erp5/trunk/products/CMFActivity/skins/activity/
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Nov 28 15:26:53 CET 2007
Author: ivan
Date: Wed Nov 28 15:26:53 2007
New Revision: 17874
URL: http://svn.erp5.org?rev=17874&view=rev
Log:
Get current time as UTC rather than local time (see r17867 - r17870).
Modified:
erp5/trunk/products/CMFActivity/skins/activity/SQLBase_getNow.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLDict_processMessage.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLDict_setPriority.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLDict_writeMessage.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_processMessage.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_setPriority.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_writeMessage.zsql
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLBase_getNow.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLBase_getNow.zsql?rev=17874&r1=17873&r2=17874&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLBase_getNow.zsql (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLBase_getNow.zsql Wed Nov 28 15:26:53 2007
@@ -8,4 +8,4 @@
class_file:
</dtml-comment>
<params></params>
-SELECT NOW()
+SELECT UTC_TIMESTAMP()
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=17874&r1=17873&r2=17874&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLDict_processMessage.zsql (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLDict_processMessage.zsql Wed Nov 28 15:26:53 2007
@@ -10,7 +10,7 @@
<params>uid</params>
UPDATE message
SET
- processing_date = NOW(),
+ processing_date = UTC_TIMESTAMP(),
processing = 1
WHERE
uid IN (
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLDict_setPriority.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLDict_setPriority.zsql?rev=17874&r1=17873&r2=17874&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLDict_setPriority.zsql (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLDict_setPriority.zsql Wed Nov 28 15:26:53 2007
@@ -22,7 +22,7 @@
, priority = <dtml-sqlvar priority type="int">
</dtml-if>
<dtml-if delay>
- , date = DATE_ADD(NOW(), INTERVAL <dtml-sqlvar delay type="int"> * (retry + 1) SECOND)
+ , date = DATE_ADD(UTC_TIMESTAMP(), INTERVAL <dtml-sqlvar delay type="int"> * (retry + 1) SECOND)
<dtml-elif date>
, date = <dtml-sqlvar date type="datetime">
</dtml-if>
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLDict_writeMessage.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLDict_writeMessage.zsql?rev=17874&r1=17873&r2=17874&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLDict_writeMessage.zsql (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLDict_writeMessage.zsql Wed Nov 28 15:26:53 2007
@@ -21,7 +21,7 @@
SET
uid = <dtml-sqlvar uid type="int">,
path = <dtml-sqlvar path type="string">,
- date = <dtml-if date><dtml-sqlvar date type="datetime"><dtml-else>NOW()</dtml-if>,
+ date = <dtml-if date><dtml-sqlvar date type="datetime"><dtml-else>UTC_TIMESTAMP()</dtml-if>,
method_id = <dtml-sqlvar method_id type="string">,
processing_node = <dtml-sqlvar processing_node type="int">,
processing = 0,
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql?rev=17874&r1=17873&r2=17874&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql Wed Nov 28 15:26:53 2007
@@ -25,7 +25,7 @@
(
<dtml-sqlvar expr="uid_list[loop_item]" type="int">,
<dtml-sqlvar expr="path_list[loop_item]" type="string">,
- <dtml-if date_list><dtml-if expr="date_list[loop_item] is not None"><dtml-sqlvar expr="date_list[loop_item]" type="datetime"><dtml-else>NOW()</dtml-if><dtml-else>NOW()</dtml-if>,
+ <dtml-if date_list><dtml-if expr="date_list[loop_item] is not None"><dtml-sqlvar expr="date_list[loop_item]" type="datetime"><dtml-else>UTC_TIMESTAMP()</dtml-if><dtml-else>UTC_TIMESTAMP()</dtml-if>,
<dtml-sqlvar expr="method_id_list[loop_item]" type="string">,
<dtml-if processing_node_list><dtml-sqlvar expr="processing_node_list[loop_item]" type="int"><dtml-else>-1</dtml-if>,
0,
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_processMessage.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_processMessage.zsql?rev=17874&r1=17873&r2=17874&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_processMessage.zsql (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_processMessage.zsql Wed Nov 28 15:26:53 2007
@@ -11,7 +11,7 @@
UPDATE
message_queue
SET
- processing_date = NOW(),
+ processing_date = UTC_TIMESTAMP(),
processing=1
WHERE
uid IN (
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_setPriority.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_setPriority.zsql?rev=17874&r1=17873&r2=17874&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_setPriority.zsql (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_setPriority.zsql Wed Nov 28 15:26:53 2007
@@ -19,7 +19,7 @@
, priority = <dtml-sqlvar priority type="int">
</dtml-if>
<dtml-if delay>
- , date = DATE_ADD(NOW(), INTERVAL <dtml-sqlvar delay type="int"> SECOND)
+ , date = DATE_ADD(UTC_TIMESTAMP(), INTERVAL <dtml-sqlvar delay type="int"> SECOND)
<dtml-elif date>
, date = <dtml-sqlvar date type="datetime">
</dtml-if>
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_writeMessage.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_writeMessage.zsql?rev=17874&r1=17873&r2=17874&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_writeMessage.zsql (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_writeMessage.zsql Wed Nov 28 15:26:53 2007
@@ -19,7 +19,7 @@
SET
uid = <dtml-sqlvar uid type="int">,
path = <dtml-sqlvar path type="string">,
- date = <dtml-if date><dtml-sqlvar date type="datetime"><dtml-else>NOW()</dtml-if>,
+ date = <dtml-if date><dtml-sqlvar date type="datetime"><dtml-else>UTC_TIMESTAMP()</dtml-if>,
method_id = <dtml-sqlvar method_id type="string">,
<dtml-if processing_node>
processing_node = <dtml-sqlvar processing_node type="int">,
More information about the Erp5-report
mailing list