From 09583b898d919b8ce4cfa303a6bee650ae415fa7 Mon Sep 17 00:00:00 2001
From: Marko Kreen
Date: Wed, 9 Feb 2011 14:05:04 +0200
Subject: dbscript: make db service-api errors noiseless

---
 python/skytools/scripting.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'python/skytools/scripting.py')

diff --git a/python/skytools/scripting.py b/python/skytools/scripting.py
index 43513ec8..90125f58 100644
--- a/python/skytools/scripting.py
+++ b/python/skytools/scripting.py
@@ -816,7 +816,7 @@ class DBScript(object):
                 self.log.warning("%s" % (msg,))
             else:
                 self.log.error("%s" % (msg,))
-                self.log.error("Query was: %s" % quote_statement(sql, args))
+                self.log.debug("Query was: %s" % quote_statement(sql, args))
                 ok = False
         return (ok, rows)
 
@@ -847,7 +847,10 @@ class DBScript(object):
         else:
             if db:
                 db.rollback()
-            raise Exception("db error")
+            if self.options.verbose:
+                raise Exception("db error")
+            # error is already logged
+            sys.exit(1)
 
     def exec_cmd_many(self, db_or_curs, sql, baseargs, extra_list, commit = True, quiet = False):
         """Run SQL on db multiple times."""
@@ -865,7 +868,11 @@ class DBScript(object):
         else:
             if db:
                 db.rollback()
-            raise Exception("db error")
+            if self.options.verbose:
+                raise Exception("db error")
+            # error is already logged
+            sys.exit(1)
+
 
     def listen(self, dbname, channel):
         """Make connection listen for specific event channel.
-- 
cgit v1.2.3