Skip to content
Snippets Groups Projects
Commit e6dccb62 authored by John Chilton's avatar John Chilton
Browse files

Import Galaxy's copy of pastescript into project.

Eliminates required dependency on paste for Python 3 (though still need to update actual code for Python 3).
parent cfc8b526
No related branches found
No related tags found
No related merge requests found
"""
Command for loading and serving wsgi apps taken from PasteScript
"""
This diff is collapsed.
This diff is collapsed.
...@@ -38,8 +38,6 @@ except ImportError: ...@@ -38,8 +38,6 @@ except ImportError:
return options return options
from paste.deploy.loadwsgi import ConfigLoader
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
REQUIRES_DAEMONIZE_MESSAGE = "Attempted to use Pulsar in daemon mode, but daemonize is unavailable." REQUIRES_DAEMONIZE_MESSAGE = "Attempted to use Pulsar in daemon mode, but daemonize is unavailable."
...@@ -144,6 +142,7 @@ def load_app_configuration(ini_path=None, app_conf_path=None, app_name=None, loc ...@@ -144,6 +142,7 @@ def load_app_configuration(ini_path=None, app_conf_path=None, app_name=None, loc
""" """
""" """
if ini_path and local_conf is None: if ini_path and local_conf is None:
from galaxy.util.pastescript.loadwsgi import ConfigLoader
local_conf = ConfigLoader(ini_path).app_context(app_name).config() local_conf = ConfigLoader(ini_path).app_context(app_name).config()
local_conf = local_conf or {} local_conf = local_conf or {}
if app_conf_path is None and "app_config" in local_conf: if app_conf_path is None and "app_config" in local_conf:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment