From d403c43123b921f28a463ecbb28ccae2f82452c9 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Wed, 8 Apr 2015 11:53:32 -0400 Subject: [PATCH] Similar fix as the previous -- Galaxy wasn't disposing of pooled connections prior to returning webapp and (potential) forking. --- lib/galaxy/webapps/galaxy/buildapp.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/buildapp.py b/lib/galaxy/webapps/galaxy/buildapp.py index d7492408b52..4c57821e0f5 100644 --- a/lib/galaxy/webapps/galaxy/buildapp.py +++ b/lib/galaxy/webapps/galaxy/buildapp.py @@ -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()