Fixed Pickle exception for Windows

cabernetwork · Dec 22, 2023 · 5cbb88b · 5cbb88b
1 parent c2447e0
commit 5cbb88b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/lib/common/utils.py b/lib/common/utils.py
@@ -37,7 +37,7 @@
 
 import lib.common.exceptions as exceptions
 
-VERSION = '0.9.14.00-RC09'
+VERSION = '0.9.14.00-RC10'
 CABERNET_URL = 'https://github.com/cabernetwork/cabernet'
 CABERNET_ID = 'cabernet'
 CABERNET_REPO = 'manifest.json'

diff --git a/lib/db/db.py b/lib/db/db.py
@@ -95,6 +95,7 @@ def add(self, _table, _values):
                 DB.conn[self.db_name][threading.get_ident()].commit()
                 lastrow = cur.lastrowid
                 cur.close()
+                self.logger.trace('DB add() exit {}'.format(threading.get_ident()))
                 return lastrow
             except sqlite3.OperationalError as e:
                 self.logger.warning('{} Add request ignored, retrying {}, {}'
@@ -120,6 +121,7 @@ def delete(self, _table, _values):
                 num_deleted = cur.rowcount
                 DB.conn[self.db_name][threading.get_ident()].commit()
                 cur.close()
+                self.logger.trace('DB delete() exit {}'.format(threading.get_ident()))
                 return num_deleted
             except sqlite3.OperationalError as e:
                 self.logger.warning('{} Delete request ignored, retrying {}, {}'
@@ -147,6 +149,7 @@ def update(self, _table, _values=None):
                 lastrow = cur.lastrowid
                 cur.close()
                 LOCK.release()
+                self.logger.trace('DB update() exit {}'.format(threading.get_ident()))
                 return lastrow
             except sqlite3.OperationalError as e:
                 self.logger.notice('{} Update request ignored, retrying {}, {}'

diff --git a/lib/main.py b/lib/main.py
@@ -145,7 +145,13 @@ def main(script_dir):
         plugins = init_plugins(config_obj)
         config_obj.defn_json = None
         init_versions(plugins)
+
         if opersystem in ['Windows']:
+            # Need to make sure all http_sessions are None since
+            # that object cannot pickle
+            for name, plugin in plugins.plugins.items():
+                if plugin.plugin_obj.http_session is not None:
+                    plugin.plugin_obj.http_session = None
             pickle_it = Pickling(config)
             pickle_it.to_pickle(plugins)