Changeset 6d8e1e9 in rattail

Timestamp:

07/26/2022 02:24:59 PM (6 months ago)

Author:

Lance Edgar <lance@…>

Branches:

master

Children:

5685603

Parents:

9820a0f

git-author:

Lance Edgar <lance@…> (07/26/2022 02:19:04 PM)

git-committer:

Lance Edgar <lance@…> (07/26/2022 02:24:59 PM)

Message:

Avoid extra sessions in datasync, when fetching config from DB

finally, tracked down why extra sessions were happening..i think.
there may be more instances of this problem elsewhere; will fix as
they're encountered

refs #6, #7

Location:

rattail

Files:

• app.py (modified) (1 diff)
• config.py (modified) (2 diffs)
• datasync/daemon.py (modified) (3 diffs)
• datasync/rattail.py (modified) (4 diffs)

rattail/app.py

@@ -832 +832 @@
         from rattail.db import Session
 
-        # always try to set default continuum user if possible
+        session = Session(**kwargs)
+
+        # try to set continuum user unless kwargs already set it
         if 'continuum_user' not in kwargs:
             if not user:
-                user = self.config.get('rattail', 'runas.default')
+                user = self.config.get('rattail', 'runas.default',
+                                       session=session)
             if user:
-                kwargs['continuum_user'] = user
-
-        return Session(**kwargs)
+                session.set_continuum_user(user)
+
+        return session
 
     def cache_model(self, session, model, **kwargs):

rattail/config.py

@@ -411 +411 @@
         """
         if not hasattr(self, 'app'):
-            spec = self.get('rattail', 'app.handler',
+            spec = self.get('rattail', 'app.handler', usedb=False,
                             default='rattail.app:AppHandler')
             factory = load_object(spec)
@@ -580 +580 @@
             return url.rstrip('/')
 
-    def datasync_url(self):
+    def datasync_url(self, **kwargs):
         """
         Returns configured URL for managing datasync daemon.
         """
-        return self.get('rattail.datasync', 'url')
+        return self.get('rattail.datasync', 'url', **kwargs)
 
     def get_enum(self, **kwargs):

rattail/datasync/daemon.py

@@ -564 +564 @@
     # amounts of changes land in the queue with same timestamp, and versioning
     # is also enabled.
-    batch_size = config.getint('rattail.datasync', 'batch_size_limit')
+    batch_size = config.getint('rattail.datasync', 'batch_size_limit',
+                               session=session)
     if batch_size and len(changes) > batch_size:
         changes = changes[:batch_size]
@@ -594 +595 @@
                     'attempts': attempts,
                     'traceback': ''.join(format_exception(exc_type, exc, traceback)).strip(),
-                    'datasync_url': config.datasync_url(),
+                    'datasync_url': config.datasync_url(session=session),
                 })
                 return False
@@ -649 +650 @@
                     'attempts': attempts,
                     'traceback': ''.join(format_exception(exc_type, exc, traceback)).strip(),
-                    'datasync_url': config.datasync_url(),
+                    'datasync_url': config.datasync_url(session=session),
                 })
                 return False

rattail/datasync/rattail.py

@@ -61 +61 @@
         changes = session.query(model.Change).all()
         session.expunge_all()
+        # nb. fetch config flag while we have session open
+        deleted_first = self.config.getbool(
+            'rattail.datasync', 'rattail_watcher_deleted_first',
+            session=session,
+            default=False)
         session.close()
         if not changes:
@@ -86 +91 @@
         # so that deletes are processed last, by the consumer(s), to
         # hopefully avoid dependency issues
-        deleted_first = self.config.getbool(
-            'rattail.datasync', 'rattail_watcher_deleted_first',
-            default=False)
         if deleted_first:
             final = deleted + dirty
@@ -184 +186 @@
         self.topo_sortkey = make_topo_sortkey(self.model)
 
+    # TODO: deprecate / remove this
     def get_data_model(self):
         """
@@ -189 +192 @@
         Defaults to ``rattail.db.model``.
         """
-        return model
+        return self.config.get_model()
 
     def process_changes(self, host_session, changes):