heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return DatabaseManager or DatabaseMaster depending on DISABLE_GLOBALS

Browse Source 
They're both similar!  One sets up sessions, one grabs sessions from a global object.
This commit is contained in:
Christopher Allan Webber 2014-11-30 13:53:21 -06:00
parent 5f3703d545
commit 63f6a418d1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mediagoblin/db/open.py
View File

@ -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):