opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Similar fix as the previous -- Galaxy wasn't disposing of pooled connections prior to returning webapp and (potential) forking.

Browse Source
This commit is contained in:
Dannon Baker
2015-04-08 14:21:34 -04:00
parent d6bf6fc2b2
commit d403c43123
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/buildapp.py
+4 -4
View File
@@ -106,13 +106,13 @@ def app_factory( global_conf, **kwargs ):
pack_scripts()
# Close any pooled database connections before forking
try:
galaxy.model.mapping.metadata.engine.connection_provider._pool.dispose()
galaxy.model.mapping.metadata.bind.dispose()
except:
pass
log.exception("Unable to dispose of pooled galaxy model database connections.")
try:
galaxy.model.tool_shed_install.mapping.metadata.engine.connection_provider._pool.dispose()
galaxy.model.tool_shed_install.mapping.metadata.bind.dispose()
except:
pass
log.exception("Unable to dispose of pooled toolshed install model database connections.")
if not app.config.is_uwsgi:
postfork_setup()