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

Merge pull request #6295 from nsoranzo/release_18.01_followup_on_6262

Browse Source 
[18.01] Fix `GALAXY_RUN_ALL=1 ./run.sh --daemon`
This commit is contained in:
Nate Coraor
2018-06-06 14:43:26 -04:00
committed by GitHub
parent a0004db720 7b741a32cd
commit a2fe4b0c76
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
run.sh
+2 -2
View File
@@ -59,12 +59,12 @@ find_server "${GALAXY_CONFIG_FILE:-none}" galaxy
if [ "$run_server" = "python" -a -n "$GALAXY_RUN_ALL" ]; then
servers=$(sed -n 's/^\[server:\(.*\)\]/\1/ p' "$GALAXY_CONFIG_FILE" | xargs echo)
if [ -z "$stop_daemon_arg_set" -a -z "$daemon_or_restart_arg_set" ]; then
echo "ERROR: \$GALAXY_RUN_ALL cannot be used without the '--daemon', '--stop-daemon' or 'restart' arguments to run.sh"
echo "ERROR: \$GALAXY_RUN_ALL cannot be used without the '--daemon', '--stop-daemon', 'restart', 'start' or 'stop' arguments to run.sh"
exit 1
fi
for server in $servers; do
echo "Executing: python $server_args --server-name=\"$server\" --pid-file=\"$server.pid\" --log-file=\"$server.log\""
python $server_args --server-name="$server" --pid-file="$server.pid" --log-file="$server.log"
eval python $server_args --server-name="$server" --pid-file="$server.pid" --log-file="$server.log"
if [ -n "$wait_arg_set" -a -n "$daemon_or_restart_arg_set" ]; then
while true; do
sleep 1