From 8fd47444b71b9e340f994a37b35ad60cff0b3dff Mon Sep 17 00:00:00 2001
From: Petr Jelinek
Date: Mon, 17 Dec 2012 18:25:14 +0100
Subject: Fix exception_hook rash on null query string

---
 python/skytools/scripting.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

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" % (
-- 
cgit v1.2.3