diff options
| -rwxr-xr-x | bin/kasabi | 2 | ||||
| -rw-r--r-- | conf/crontab.ugly | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/bin/kasabi b/bin/kasabi index 47186e64b..5b99ba4ff 100755 --- a/bin/kasabi +++ b/bin/kasabi @@ -47,7 +47,7 @@ def main(): if len(sys.argv) > 1 and sys.argv[1].isdigit(): cursor.execute("%s AND id=%%s" % query, (sys.argv[1],)) else: - cursor.execute("%s AND lastupdate > %%s" % query, (max_lastUpdate,)) + cursor.execute("%s AND lastupdate > %%s ORDER BY lastupdate" % query, (str(max_lastUpdate),)) for report in cursor: changeset = FixMyStreetChangeSet(dataset) diff --git a/conf/crontab.ugly b/conf/crontab.ugly index ec3776179..2d4467aab 100644 --- a/conf/crontab.ugly +++ b/conf/crontab.ugly @@ -36,13 +36,7 @@ MAILTO=cron-!!(*= $site *)!!@mysociety.org 00 8 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/check-for-zombies !!(*= $user *)!! -# Commented out as there was an error with the code -# -# File "/data/vhost/www.fixmystreet.com/fixmystreet/bin/kasabi", line 50, in main -# cursor.execute("%s AND lastupdate > %%s" % query, (max_lastUpdate,)) -# psycopg2.ProgrammingError: can't adapt type 'Literal' -# -# !!(* if ($vhost eq 'www.fixmystreet.com') { *)!! -# 10 * * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet-virtualenv/bin/python /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/kasabi -# !!(* } *)!! +!!(* if ($vhost eq 'www.fixmystreet.com') { *)!! +10 * * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet-virtualenv/bin/python /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/kasabi +!!(* } *)!! |