tweak for rerunning the daily backup script in the same night

git-svn-id: svn://presbrey.mit.edu/sql@169 a142d4bd-2cfb-0310-9673-cb33a7e74f58

diff --git a/libexec/daily_afs_backups b/libexec/daily_afs_backups
index 08f72be37e75bdf1631249f98cdd57ae347a4a84..4346483d6cab7b774d436635021105c5ef688508 100755 (executable)
--- a/libexec/daily_afs_backups
+++ b/libexec/daily_afs_backups
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import os, sys
+import os, sys, time
 import sql.db
 from sql.util import new_cursor, get_dbs, db_backup_pre, db_backup_mkdir
 from Queue import Queue, Empty
@@ -57,6 +57,10 @@ def producer():
         log = sql.db.Backup.get_by(db=db)
         if not log:
             log = sql.db.Backup(db=db)
+        elif log.skip_date:
+            if time.mktime(log.skip_date.timetuple()) + 3600 > time.time():
+                # never recheck a db skipped in the past hour
+                continue
         d = db_backup_pre(c, db)
         if d[0]:
             queue.put((db, d[1]))
@@ -66,7 +70,7 @@ def producer():
             log.skip_reason = d[1]
             log.skip_date = sql.db.func.now()
         log.save_or_update()
-        sql.db.session.flush()
+        #sql.db.session.flush()
 
 try:
     producer()