more robust disposing of database session

avoid spamming the log with debug messages from libraries
2019-07-14 14:43:40 +03:00
parent be64961de5
commit a836df9a5a
7 changed files with 33 additions and 28 deletions
--- a/cps/ub.py
+++ b/cps/ub.py
@ -478,13 +478,11 @@ def init_db(app_db_path):
 def dispose():
    global session

-    engine = None
-    if session:
-        engine = session.bind
-        try: session.close()
-        except: pass
-        session = None
-
-    if engine:
-        try: engine.dispose()
+    old_session = session
+    session = None
+    if old_session:
+        try: old_session.close()
        except: pass
+        if old_session.bind:
+            try: old_session.bind.dispose()
+            except: pass