diff options
author | Marko Kreen | 2011-02-09 12:05:04 +0000 |
---|---|---|
committer | Marko Kreen | 2011-02-09 12:05:04 +0000 |
commit | 09583b898d919b8ce4cfa303a6bee650ae415fa7 (patch) | |
tree | be4b4ceb6182a3d67d66e06848a146a597fb4340 /python/skytools/scripting.py | |
parent | d5649a0c45de131958288ff31ebeee5a086440a5 (diff) |
dbscript: make db service-api errors noiseless
Diffstat (limited to 'python/skytools/scripting.py')
-rw-r--r-- | python/skytools/scripting.py | 13 |
1 files changed, 10 insertions, 3 deletions
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. |