CascadeAdmin: add node name prefix messages from db

1 files changed, 19 insertions, 13 deletions

diff --git a/python/skytools/scripting.py b/python/skytools/scripting.py
index ad67ef26..83511804 100644
--- a/python/skytools/scripting.py
+++ b/python/skytools/scripting.py
@@ -807,9 +807,14 @@ class DBScript(BaseScript):
         except select.error, d:
             self.log.info('wait canceled')
 
-    def _exec_cmd(self, curs, sql, args, quiet = False):
+    def _exec_cmd(self, curs, sql, args, quiet = False, prefix = None):
         """Internal tool: Run SQL on cursor."""
-        self.log.debug("exec_cmd: %s" % skytools.quote_statement(sql, args))
+        if self.options.verbose:
+            self.log.debug("exec_cmd: %s" % skytools.quote_statement(sql, args))
+
+        _pfx = ""
+        if prefix:
+            _pfx = "[%s] " % prefix
         curs.execute(sql, args)
         ok = True
         rows = curs.fetchall()
@@ -824,32 +829,32 @@ class DBScript(BaseScript):
                 sys.exit(1)
             level = code / 100
             if level == 1:
-                self.log.debug("%d %s" % (code, msg))
+                self.log.debug("%s%d %s" % (_pfx, code, msg))
             elif level == 2:
                 if quiet:
-                    self.log.debug("%d %s" % (code, msg))
+                    self.log.debug("%s%d %s" % (_pfx, code, msg))
                 else:
-                    self.log.info("%s" % (msg,))
+                    self.log.info("%s%s" % (_pfx, msg,))
             elif level == 3:
-                self.log.warning("%s" % (msg,))
+                self.log.warning("%s%s" % (_pfx, msg,))
             else:
-                self.log.error("%s" % (msg,))
+                self.log.error("%s%s" % (_pfx, msg,))
                 self.log.debug("Query was: %s" % skytools.quote_statement(sql, args))
                 ok = False
         return (ok, rows)
 
-    def _exec_cmd_many(self, curs, sql, baseargs, extra_list, quiet = False):
+    def _exec_cmd_many(self, curs, sql, baseargs, extra_list, quiet = False, prefix=None):
         """Internal tool: Run SQL on cursor multiple times."""
         ok = True
         rows = []
         for a in extra_list:
-            (tmp_ok, tmp_rows) = self._exec_cmd(curs, sql, baseargs + [a], quiet=quiet)
+            (tmp_ok, tmp_rows) = self._exec_cmd(curs, sql, baseargs + [a], quiet, prefix)
             if not tmp_ok:
                 ok = False
             rows += tmp_rows
         return (ok, rows)
 
-    def exec_cmd(self, db_or_curs, q, args, commit = True, quiet = False):
+    def exec_cmd(self, db_or_curs, q, args, commit = True, quiet = False, prefix = None):
         """Run SQL on db with code/value error handling."""
         if hasattr(db_or_curs, 'cursor'):
             db = db_or_curs
@@ -857,7 +862,7 @@ class DBScript(BaseScript):
         else:
             db = None
             curs = db_or_curs
-        (ok, rows) = self._exec_cmd(curs, q, args, quiet = quiet)
+        (ok, rows) = self._exec_cmd(curs, q, args, quiet, prefix)
         if ok:
             if commit and db:
                 db.commit()
@@ -870,7 +875,8 @@ class DBScript(BaseScript):
             # error is already logged
             sys.exit(1)
 
-    def exec_cmd_many(self, db_or_curs, sql, baseargs, extra_list, commit = True, quiet = False):
+    def exec_cmd_many(self, db_or_curs, sql, baseargs, extra_list,
+                      commit = True, quiet = False, prefix = None):
         """Run SQL on db multiple times."""
         if hasattr(db_or_curs, 'cursor'):
             db = db_or_curs
@@ -878,7 +884,7 @@ class DBScript(BaseScript):
         else:
             db = None
             curs = db_or_curs
-        (ok, rows) = self._exec_cmd_many(curs, sql, baseargs, extra_list, quiet=quiet)
+        (ok, rows) = self._exec_cmd_many(curs, sql, baseargs, extra_list, quiet, prefix)
         if ok:
             if commit and db:
                 db.commit()