opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-21 05:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_22.01' into dev

Browse Source
This commit is contained in:
Nicola Soranzo
2022-02-24 11:56:51 +00:00
parent 689cd0eb2b b710dcb1ec
commit 22f6674f8d
9 changed files with 280 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/common_startup_functions.sh
+10 -4
View File
@@ -162,9 +162,11 @@ find_server() {
gunicorn_worker="galaxy.webapps.galaxy.workers.Worker"
;;
reports)
# TODO: don't override this var, and is this really the only way to configure the port?
GUNICORN_CMD_ARGS="--bind=localhost:9001"
# TODO: is this really the only way to configure the port?
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}
@@ -187,9 +189,13 @@ find_server() {
fi
server_args="$server_args $uwsgi_args"
elif [ "$APP_WEBSERVER" = "gunicorn" ]; then
export GUNICORN_CMD_ARGS="${GUNICORN_CMD_ARGS:-\"--bind=localhost:8080\"}"
run_server="gunicorn"
server_args="'galaxy.webapps.${server_app}.fast_factory:factory()' --pythonpath lib -k ${gunicorn_worker:-$default_gunicorn_worker} $gunicorn_args"
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"
else
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
server_args="$server_args --pid \"$PID_FILE\""
fi