summaryrefslogtreecommitdiff
path: root/python/skytools/scripting.py
diff options
context:
space:
mode:
authorPetr Jelinek2012-12-17 17:25:14 +0000
committerPetr Jelinek2012-12-17 17:29:35 +0000
commit8fd47444b71b9e340f994a37b35ad60cff0b3dff (patch)
tree75635bed253e3cce14a98490d2b065aca50d91aa /python/skytools/scripting.py
parent7b5fc2f4d0f9de38fae69c13c72723ae5ee8c0fb (diff)
Fix exception_hook rash on null query string
Diffstat (limited to 'python/skytools/scripting.py')
-rw-r--r--python/skytools/scripting.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/python/skytools/scripting.py b/python/skytools/scripting.py
index 38e1aee4..4f1b0a97 100644
--- a/python/skytools/scripting.py
+++ b/python/skytools/scripting.py
@@ -779,8 +779,7 @@ class DBScript(BaseScript):
if cname:
# Properly named connection
cname = d.cursor.connection.my_name
- dsn = getattr(conn, 'dsn', '?')
- sql = getattr(curs, 'query', '?')
+ sql = getattr(curs, 'query', None) or '?'
if len(sql) > 200: # avoid logging londiste huge batched queries
sql = sql[:60] + " ..."
self.log.exception("Job %s got error on connection '%s': %s. Query: %s" % (