fix reconnect error handling in EventHistory

kelvich · kelvich · commit baa4d9094f59 · 2016-07-19T16:11:47.000+03:00
diff --git a/contrib/mmts/tests2/lib/bank_client.py b/contrib/mmts/tests2/lib/bank_client.py
@@ -131,18 +131,17 @@ def exec_tx(self, name, tx_block):
         while self.run.value:
             event_id = self.history.register_start(name)
 
-            if conn.closed:
-                self.history.register_finish(event_id, 'ReConnect')
-                conn = psycopg2.connect(self.connstr)
-                cur = conn.cursor()
-
             try:
+                if conn.closed:
+                    conn = psycopg2.connect(self.connstr)
+                    cur = conn.cursor()
+                    self.history.register_finish(event_id, 'ReConnect')
+                    continue
+
                 tx_block(conn, cur)                
                 self.history.register_finish(event_id, 'Commit')
-            except psycopg2.InterfaceError:
-                self.history.register_finish(event_id, 'InterfaceError')
-            except psycopg2.Error:
-                self.history.register_finish(event_id, 'PsycopgError')
+            except psycopg2.Error as e:
+                self.history.register_finish(event_id, e.pgerror)
 
         cur.close()
         conn.close()
diff --git a/contrib/mmts/tests2/lib/event_history.py b/contrib/mmts/tests2/lib/event_history.py
@@ -46,6 +46,7 @@ def load_queue(self):
                 # finish mark
                 if event['event_id'] not in self.running_events:
                     # found finish event without corresponding start
+                    print(event)
                     print("ololololo!")
                     raise
 
