From 408b8dd8551120468e3924d5db5fc7ee4775dc1d Mon Sep 17 00:00:00 2001 From: Louis Rossouw Date: Sat, 29 Aug 2015 02:41:47 +0200 Subject: [PATCH] Fix to avoid triggering this bug: http://sourceforge.net/p/mysql-python/bugs/325/ We remove miliseconds from datetime. --- poller-service.py | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/poller-service.py b/poller-service.py index d8b48f455..099bf7213 100755 --- a/poller-service.py +++ b/poller-service.py @@ -195,18 +195,24 @@ poller_group = ('and poller_group IN({0}) ' # Add last_polled and last_polled_timetaken so we can sort by the time the last poll started, with the goal # of having each device complete a poll within the given time range. dev_query = ('SELECT device_id, status, ' - 'DATE_ADD( ' - ' DATE_SUB( ' - ' last_polled, ' - ' INTERVAL last_polled_timetaken SECOND ' - ' ), ' - ' INTERVAL {0} SECOND) AS next_poll, ' - 'DATE_ADD( ' - ' DATE_SUB( ' - ' last_discovered, ' - ' INTERVAL last_discovered_timetaken SECOND ' - ' ), ' - ' INTERVAL {1} SECOND) AS next_discovery ' + 'CAST( ' + ' DATE_ADD( ' + ' DATE_SUB( ' + ' last_polled, ' + ' INTERVAL last_polled_timetaken SECOND ' + ' ), ' + ' INTERVAL {0} SECOND) ' + ' AS DATETIME(0) ' + ') AS next_poll, ' + 'CAST( ' + ' DATE_ADD( ' + ' DATE_SUB( ' + ' last_discovered, ' + ' INTERVAL last_discovered_timetaken SECOND ' + ' ), ' + ' INTERVAL {1} SECOND) ' + ' AS DATETIME(0) ' + ') as next_discovery ' 'FROM devices WHERE ' 'disabled = 0 ' 'AND IS_FREE_LOCK(CONCAT("polling.", device_id)) '