diff options
| author | Rob Austein <sra@hactrn.net> | 2013-06-26 17:32:53 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2013-06-26 17:32:53 +0000 |
| commit | db573437c549e27bae57a4ab13b4bd940b84bf37 (patch) | |
| tree | 73c7b94172e3be8a0e5140dce7152400098ab540 | |
| parent | 9b316b6a2de052bbcc9cff72e99a11948810b8e0 (diff) | |
Don't allow exceptions (eg, MySQL connection errors) to prevent us
from scheduling next cron cycle. Closes #560.
svn path=/trunk/; revision=5416
| -rw-r--r-- | rpkid/rpki/rpkid.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/rpkid/rpki/rpkid.py b/rpkid/rpki/rpkid.py index 02283545..7719f49b 100644 --- a/rpkid/rpki/rpkid.py +++ b/rpkid/rpki/rpkid.py @@ -381,8 +381,13 @@ class main(object): cb() completion = rpki.rpkid_tasks.CompletionHandler(done) - for s in rpki.left_right.self_elt.sql_fetch_all(self): - s.schedule_cron_tasks(completion) + try: + selves = rpki.left_right.self_elt.sql_fetch_all(self) + except Exception, e: + rpki.log.warn("Error pulling self_elts from SQL, maybe SQL server is down? (%s)" % e) + else: + for s in selves: + s.schedule_cron_tasks(completion) nothing_queued = completion.count == 0 assert self.use_internal_cron or self.cron_timeout is None |