diff options
author | Qingyu Zhao <qzhao@gitlab.com> | 2019-07-03 14:11:48 +1000 |
---|---|---|
committer | Qingyu Zhao <qzhao@gitlab.com> | 2019-07-09 23:31:32 +1000 |
commit | b7ea4bd853e4735be68b7438815c02aa56f51a15 (patch) | |
tree | 91807815689b6e077298dacbf1fecd054a432df0 /bin/web | |
parent | 8a2c53d6400287bbb29056c4d007ee571b292937 (diff) | |
download | gitlab-ce-b7ea4bd853e4735be68b7438815c02aa56f51a15.tar.gz |
Enable puma by default in GDK490-enable-puma-by-default-in-GDK
Two changes:
1. Move bin/web to bin/web_unicorn(removed PUMA switching logic)
Introduce new shadow script bin/web. Now we have 3 scripts working
together: bin/web, bin/web_puma, bin/web_unicorn
In bin/web, it checks ENV['USE_WEB_SERVER']:
- if value is 'puma' or value is not set, call bin/web_puma
- if value is 'unicorn', call bin/web_unicorn
- report error if other values given
2. Gitlab rails allow ENV setting to override timeout
- ENV['GITLAB_RAILS_RACK_TIMEOUT'] for service_timeout
- ENV['GITLAB_RAILS_WAIT_TIMEOUT'] for wait_timeout
Diffstat (limited to 'bin/web')
-rwxr-xr-x | bin/web | 68 |
1 files changed, 13 insertions, 55 deletions
@@ -1,63 +1,21 @@ #!/bin/sh +set -e + cd $(dirname $0)/.. app_root=$(pwd) -# Switch to experimental PUMA configuration -if [ -n "${EXPERIMENTAL_PUMA}" ]; then - exec bin/web_puma "$@" -fi - -unicorn_pidfile="$app_root/tmp/pids/unicorn.pid" -unicorn_config="$app_root/config/unicorn.rb" -unicorn_cmd="bundle exec unicorn_rails -c $unicorn_config -E $RAILS_ENV" - -get_unicorn_pid() -{ - local pid=$(cat $unicorn_pidfile) - if [ -z "$pid" ] ; then - echo "Could not find a PID in $unicorn_pidfile" - exit 1 - fi - unicorn_pid=$pid -} - -start() -{ - exec $unicorn_cmd -D -} - -start_foreground() -{ - exec $unicorn_cmd -} - -stop() -{ - get_unicorn_pid - kill -QUIT $unicorn_pid -} +case "$USE_WEB_SERVER" in + puma|"") # and the "" defines default + exec bin/web_puma "$@" + ;; -reload() -{ - get_unicorn_pid - kill -USR2 $unicorn_pid -} + unicorn) + exec bin/web_unicorn "$@" + ;; -case "$1" in - start) - start - ;; - start_foreground) - start_foreground - ;; - stop) - stop - ;; - reload) - reload - ;; - *) - echo "Usage: RAILS_ENV=your_env $0 {start|stop|reload}" - ;; + *) + echo "Unkown web server used by USE_WEB_SERVER: $USE_WEB_SERVER." + exit 1 + ;; esac |