Merge pull request #162 from pagreene/protection-fix

Re-implement session protection.
gyorilab · Feb 3, 2021 · e5836ed · e5836ed
2 parents ca2fce9 + 993b229
commit e5836ed
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/indra_db/databases.py b/indra_db/databases.py
@@ -386,9 +386,11 @@ def grab_session(self):
             return
         if self.session is None or not self.session.is_active:
             logger.debug('Attempting to get session...')
-            DBSession = sessionmaker(bind=self.__engine,
-                                     autoflush=not self.__protected,
-                                     autocommit=not self.__protected)
+            if not self.__protected:
+                DBSession = sessionmaker(bind=self.__engine)
+            else:
+                DBSession = sessionmaker(bind=self.__engine, autoflush=False,
+                                         autocommit=False)
             logger.debug('Got session.')
             self.session = DBSession()
             if self.session is None: