From 26017408cdb234546bf5abea70b98afb89c67bc2 Mon Sep 17 00:00:00 2001 From: Marcel Herrguth Date: Tue, 22 Jun 2021 10:37:01 +0200 Subject: [PATCH] Maintenance: Provide performance tuning options for docker-compose --- containers/zammad/docker-entrypoint.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh index 2c0e850..6ca1db0 100755 --- a/containers/zammad/docker-entrypoint.sh +++ b/containers/zammad/docker-entrypoint.sh @@ -27,6 +27,8 @@ set -e : "${ZAMMAD_RAILSSERVER_PORT:=3000}" : "${ZAMMAD_WEBSOCKET_HOST:=zammad-websocket}" : "${ZAMMAD_WEBSOCKET_PORT:=6042}" +: "${ZAMMAD_WEB_CONCURRENCY:=0}" +: "${ZAMMAD_SESSION_JOBS_CONCURRENT:=}" function check_zammad_ready { sleep 15 @@ -138,14 +140,18 @@ fi if [ "$1" = 'zammad-railsserver' ]; then test -f /opt/zammad/tmp/pids/server.pid && rm /opt/zammad/tmp/pids/server.pid + if (( ZAMMAD_WEB_CONCURRENCY > 1 )); then + PUMA_OPTS=" -w $ZAMMAD_WEB_CONCURRENCY" + fi + check_zammad_ready cd "${ZAMMAD_DIR}" - echo "starting railsserver..." + echo "starting railsserver... with WEB_CONCURRENCY=${ZAMMAD_WEB_CONCURRENCY}" #shellcheck disable=SC2101 - exec bundle exec rails server puma -b [::] -p "${ZAMMAD_RAILSSERVER_PORT}" -e "${RAILS_ENV}" + exec bundle exec rails server puma -b [::] -p "${ZAMMAD_RAILSSERVER_PORT}" -e "${RAILS_ENV}" "${PUMA_OPTS}" fi