@@ -380,6 +380,10 @@ def config_join(*args):
380
380
galaxy_root = config_join ("galaxy-dev" )
381
381
382
382
server_name = "planemo%d" % random .randint (0 , 100000 )
383
+ # Once we don't have to support earlier than 18.01 - try putting these files
384
+ # somewhere better than with Galaxy.
385
+ log_file = "%s.log" % server_name
386
+ pid_file = "%s.pid" % server_name
383
387
_handle_dependency_resolution (ctx , config_directory , kwds )
384
388
_handle_job_config_file (config_directory , server_name , kwds )
385
389
_handle_job_metrics (config_directory , kwds )
@@ -500,6 +504,10 @@ def config_join(*args):
500
504
env ["GALAXY_TEST_LOGGING_CONFIG" ] = config_join ("logging.ini" )
501
505
env ["GALAXY_DEVELOPMENT_ENVIRONMENT" ] = "1"
502
506
env ["GALAXY_SKIP_CLIENT_BUILD" ] = "1"
507
+ # Following are needed in 18.01 to prevent Galaxy from changing log and pid.
508
+ # https://github.com/galaxyproject/planemo/issues/788
509
+ env ["GALAXY_LOG" ] = log_file
510
+ env ["GALAXY_PID" ] = pid_file
503
511
web_config = _sub (WEB_SERVER_CONFIG_TEMPLATE , template_args )
504
512
write_file (config_join ("galaxy.ini" ), web_config )
505
513
tool_conf_contents = _sub (TOOL_CONF_TEMPLATE , template_args )
0 commit comments