londiste: cmd_execute() did not check ret_code of londiste.execute_start()

Also unify checking in both places - dont depend on exactly
'200' code from there.

1 files changed, 5 insertions, 1 deletions

diff --git a/python/londiste/setup.py b/python/londiste/setup.py
index efc14ea8..61f226fe 100644
--- a/python/londiste/setup.py
+++ b/python/londiste/setup.py
@@ -308,7 +308,11 @@ class LondisteSetup(CascadeAdmin):
             fname = os.path.basename(fn)
             sql = open(fn, "r").read()
             q = "select * from londiste.execute_start(%s, %s, %s, true)"
-            self.exec_cmd(db, q, [self.queue_name, fname, sql], commit = False)
+            res = self.exec_cmd(db, q, [self.queue_name, fname, sql], commit = False)
+            ret = res[0]['ret_code']
+            if ret >= 300:
+                self.log.warning("Skipping execution of '%s'" % fname)
+                continue
             for stmt in skytools.parse_statements(sql):
                 curs.execute(stmt)
             q = "select * from londiste.execute_finish(%s, %s)"