Add better exception handling with ctxtmgrs
This commit is contained in:
parent
2c624ceb2c
commit
16915ed507
|
@ -159,9 +159,13 @@ def open_db(config):
|
||||||
password=config["database_password"],
|
password=config["database_password"],
|
||||||
)
|
)
|
||||||
cur = conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor)
|
cur = conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor)
|
||||||
yield cur
|
|
||||||
except Exception:
|
except Exception:
|
||||||
raise ClusterError("Failed to connect to Postgres")
|
raise ClusterError("Failed to connect to Postgres")
|
||||||
|
|
||||||
|
try:
|
||||||
|
yield cur
|
||||||
|
except Exception:
|
||||||
|
raise
|
||||||
finally:
|
finally:
|
||||||
conn.commit()
|
conn.commit()
|
||||||
cur.close()
|
cur.close()
|
||||||
|
@ -174,9 +178,13 @@ def open_zk(config):
|
||||||
try:
|
try:
|
||||||
zkhandler = ZKHandler(config)
|
zkhandler = ZKHandler(config)
|
||||||
zkhandler.connect()
|
zkhandler.connect()
|
||||||
yield zkhandler
|
|
||||||
except Exception:
|
except Exception:
|
||||||
raise ClusterError("Failed to connect to Zookeeper")
|
raise ClusterError("Failed to connect to Zookeeper")
|
||||||
|
|
||||||
|
try:
|
||||||
|
yield zkhandler
|
||||||
|
except Exception:
|
||||||
|
raise
|
||||||
finally:
|
finally:
|
||||||
zkhandler.disconnect()
|
zkhandler.disconnect()
|
||||||
del zkhandler
|
del zkhandler
|
||||||
|
|
Loading…
Reference in New Issue