Permalink
Browse files

Fix Planemo serve for Galaxy 18.01.

  • Loading branch information...
jmchilton committed Mar 2, 2018
1 parent bf93f0f commit dc443d65b0dd300acb9e8644b470bb7c13660fd5
Showing with 8 additions and 0 deletions.
  1. +8 −0 planemo/galaxy/config.py
@@ -380,6 +380,10 @@ def config_join(*args):
galaxy_root = config_join("galaxy-dev")

server_name = "planemo%d" % random.randint(0, 100000)
# Once we don't have to support earlier than 18.01 - try putting these files
# somewhere better than with Galaxy.
log_file = "%s.log" % server_name
pid_file = "%s.pid" % server_name
_handle_dependency_resolution(ctx, config_directory, kwds)
_handle_job_config_file(config_directory, server_name, kwds)
_handle_job_metrics(config_directory, kwds)
@@ -500,6 +504,10 @@ def config_join(*args):
env["GALAXY_TEST_LOGGING_CONFIG"] = config_join("logging.ini")
env["GALAXY_DEVELOPMENT_ENVIRONMENT"] = "1"
env["GALAXY_SKIP_CLIENT_BUILD"] = "1"
# Following are needed in 18.01 to prevent Galaxy from changing log and pid.
# https://github.com/galaxyproject/planemo/issues/788
env["GALAXY_LOG"] = log_file
env["GALAXY_PID"] = pid_file
web_config = _sub(WEB_SERVER_CONFIG_TEMPLATE, template_args)
write_file(config_join("galaxy.ini"), web_config)
tool_conf_contents = _sub(TOOL_CONF_TEMPLATE, template_args)

0 comments on commit dc443d6

Please sign in to comment.