Commit351cd65

committed

fix reconnect error handling in EventHistory

1 parentb6e113a commit351cd65Copy full SHA for 351cd65

File tree

-10

lines changed

-10

lines changed

Lines changed: 8 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -127,19 +127,17 @@ def exec_tx(self, name, tx_block):`
`127`	`127`	`whileself.run.value:`
`128`	`128`	`event_id=self.history.register_start(name)`
`129`	`129`
`130`		`-ifconn.closed:`
`131`		`-self.history.register_finish(event_id,'ReConnect')`
`132`		`-conn=psycopg2.connect(self.connstr)`
`133`		`-cur=conn.cursor()`
`134`		`-`
`135`	`130`	`try:`
	`131`	`+ifconn.closed:`
	`132`	`+conn=psycopg2.connect(self.connstr)`
	`133`	`+cur=conn.cursor()`
	`134`	`+self.history.register_finish(event_id,'ReConnect')`
	`135`	`+continue`
	`136`	`+`
`136`	`137`	`tx_block(conn,cur)`
`137`	`138`	`self.history.register_finish(event_id,'Commit')`
`138`		`-exceptpsycopg2.InterfaceError:`
`139`		`-self.history.register_finish(event_id,'InterfaceError')`
`140`		`-exceptpsycopg2.Errorasx:`
`141`		`-print(x.pgerror)`
`142`		`-self.history.register_finish(event_id,'PsycopgError')`
	`139`	`+exceptpsycopg2.Errorase:`
	`140`	`+self.history.register_finish(event_id,e.pgerror)`
`143`	`141`
`144`	`142`	`cur.close()`
`145`	`143`	`conn.close()`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ def load_queue(self):`
`46`	`46`	`# finish mark`
`47`	`47`	`ifevent['event_id']notinself.running_events:`
`48`	`48`	`# found finish event without corresponding start`
	`49`	`+print(event)`
`49`	`50`	`print("ololololo!")`
`50`	`51`	`raise`
`51`	`52`

Comments

(0)