Skip to content

Commit 351cd65

Browse files
committed
fix reconnect error handling in EventHistory
1 parent b6e113a commit 351cd65

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

Diff for: tests2/lib/bank_client.py

+8-10
Original file line numberDiff line numberDiff line change
@@ -127,19 +127,17 @@ def exec_tx(self, name, tx_block):
127127
while self.run.value:
128128
event_id = self.history.register_start(name)
129129

130-
if conn.closed:
131-
self.history.register_finish(event_id, 'ReConnect')
132-
conn = psycopg2.connect(self.connstr)
133-
cur = conn.cursor()
134-
135130
try:
131+
if conn.closed:
132+
conn = psycopg2.connect(self.connstr)
133+
cur = conn.cursor()
134+
self.history.register_finish(event_id, 'ReConnect')
135+
continue
136+
136137
tx_block(conn, cur)
137138
self.history.register_finish(event_id, 'Commit')
138-
except psycopg2.InterfaceError:
139-
self.history.register_finish(event_id, 'InterfaceError')
140-
except psycopg2.Error as x:
141-
print(x.pgerror)
142-
self.history.register_finish(event_id, 'PsycopgError')
139+
except psycopg2.Error as e:
140+
self.history.register_finish(event_id, e.pgerror)
143141

144142
cur.close()
145143
conn.close()

Diff for: tests2/lib/event_history.py

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ def load_queue(self):
4646
# finish mark
4747
if event['event_id'] not in self.running_events:
4848
# found finish event without corresponding start
49+
print(event)
4950
print("ololololo!")
5051
raise
5152

0 commit comments

Comments
 (0)