From 3800ddf6ffc03bed48a59c6a0c6defd067bb3a64 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Wed, 23 Feb 2022 10:33:44 +0100 Subject: [PATCH] Move up GUNICORN_CMD_ARGS --- scripts/common_startup_functions.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/common_startup_functions.sh b/scripts/common_startup_functions.sh index d768b15e30b..f86108d01f0 100644 --- a/scripts/common_startup_functions.sh +++ b/scripts/common_startup_functions.sh @@ -163,8 +163,10 @@ find_server() { ;; reports) # TODO: don't override this var, and is this really the only way to configure the port? - GUNICORN_CMD_ARGS="--bind=localhost:9001" + GUNICORN_CMD_ARGS=${GUNICORN_CMD_ARGS:-\"--bind=localhost:9001\"} ;; + tool_shed) + GUNICORN_CMD_ARGS=${GUNICORN_CMD_ARGS:-\"--bind=localhost:9009\"} esac APP_WEBSERVER=${APP_WEBSERVER:-$default_webserver} @@ -188,11 +190,10 @@ find_server() { server_args="$server_args $uwsgi_args" elif [ "$APP_WEBSERVER" = "gunicorn" ]; then run_server="gunicorn" + export GUNICORN_CMD_ARGS if [ "$server_app" = "tool_shed" ]; then server_args="'${server_app}.webapp.fast_factory:factory()' --pythonpath lib -k ${gunicorn_worker:-$default_gunicorn_worker} $gunicorn_args" - export GUNICORN_CMD_ARGS="${GUNICORN_CMD_ARGS:-\"--bind=localhost:9009\"}" else - export GUNICORN_CMD_ARGS="${GUNICORN_CMD_ARGS:-\"--bind=localhost:8080\"}" server_args="'galaxy.webapps.${server_app}.fast_factory:factory()' --pythonpath lib -k ${gunicorn_worker:-$default_gunicorn_worker} $gunicorn_args" fi if [ "$add_pid_arg" -eq 1 ]; then