From 36f786f0eb8503840bf2151275aceaa987cf1718 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Wed, 28 Nov 2018 15:37:57 -0600 Subject: [PATCH] Clean up how we configure DB sessions on app startup not real sure if the old logic was a "problem" per se, but this cleanup seems warranted and (fingers crossed) shouldn't break anything --- tailbone/app.py | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/tailbone/app.py b/tailbone/app.py index 651612b0..8fe76c6e 100644 --- a/tailbone/app.py +++ b/tailbone/app.py @@ -31,10 +31,8 @@ import warnings import sqlalchemy as sa -import rattail.db from rattail.config import make_config from rattail.exceptions import ConfigurationError -from rattail.db.config import get_engines from rattail.db.types import GPCType from pyramid.config import Configurator @@ -63,27 +61,10 @@ def make_rattail_config(settings): settings['rattail_config'] = rattail_config rattail_config.configure_logging() - rattail_engines = settings.get('rattail_engines') - if not rattail_engines: - - # Load all Rattail database engines from config, and store in settings - # dict. This is necessary e.g. in the case of a host server, to have - # access to its subordinate store servers. - rattail_engines = get_engines(rattail_config) - settings['rattail_engines'] = rattail_engines - - # Configure the database session classes. Note that most of the time we'll - # be using the Tailbone Session, but occasionally (e.g. within batch - # processing threads) we want the Rattail Session. The reason is that - # during normal request processing, the Tailbone Session is preferable as - # it includes Zope Transaction magic. Within an explicitly-spawned thread - # however, this is *not* desirable. - rattail.db.Session.configure(bind=rattail_engines['default']) - tailbone.db.Session.configure(bind=rattail_engines['default']) - if hasattr(rattail_config, 'tempmon_engine'): - tailbone.db.TempmonSession.configure(bind=rattail_config.tempmon_engine) - if hasattr(rattail_config, 'trainwreck_engine'): - tailbone.db.TrainwreckSession.configure(bind=rattail_config.trainwreck_engine) + # configure database sessions + tailbone.db.Session.configure(bind=rattail_config.rattail_engine) + tailbone.db.TempmonSession.configure(bind=rattail_config.tempmon_engine) + tailbone.db.TrainwreckSession.configure(bind=rattail_config.trainwreck_engine) # Make sure rattail config object uses our scoped session, to avoid # unnecessary connections (and pooling limits).