diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-11-30 13:53:21 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-12-03 15:40:57 -0600 |
| commit | 63f6a418d1333e15522ec00be13d1525b68f36f5 (patch) | |
| tree | 021433c904abbfd9234ae759d984de80edc28990 /mediagoblin/db | |
| parent | 5f3703d5453a4190be368704edf944edd205ada1 (diff) | |
| download | mediagoblin-63f6a418d1333e15522ec00be13d1525b68f36f5.tar.lz mediagoblin-63f6a418d1333e15522ec00be13d1525b68f36f5.tar.xz mediagoblin-63f6a418d1333e15522ec00be13d1525b68f36f5.zip | |
Return DatabaseManager or DatabaseMaster depending on DISABLE_GLOBALS
They're both similar! One sets up sessions, one grabs sessions from a global object.
Diffstat (limited to 'mediagoblin/db')
| -rw-r--r-- | mediagoblin/db/open.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mediagoblin/db/open.py b/mediagoblin/db/open.py index 4b4dfa12..9922cc10 100644 --- a/mediagoblin/db/open.py +++ b/mediagoblin/db/open.py @@ -142,9 +142,13 @@ def setup_connection_and_db_from_config(app_config, migrations=False): # logging.getLogger('sqlalchemy.engine').setLevel(logging.INFO) - Session.configure(bind=engine) + if DISABLE_GLOBALS: + return DatabaseManager(engine) - return DatabaseMaster(engine) + else: + Session.configure(bind=engine) + + return DatabaseMaster(engine) def check_db_migrations_current(db): |