diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-07-24 10:56:14 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-07-30 15:25:46 +0000 |
| commit | 649b65e2d5da1f41999b7f2aa03593dd7127b93b (patch) | |
| tree | 52e85f0f3cdbdfb0f91c83c5542ee652e56c3136 | |
| parent | 370307a3a861616fc0a5e669d06bebb53f9b1a73 (diff) | |
| download | gitlab-ce-649b65e2d5da1f41999b7f2aa03593dd7127b93b.tar.gz | |
Merge branch 'alhashash1-12-1-stable-patch-67177' into 'master'
Fix incorrect web server selection parameter in init.d script
Closes #64802 and #65008
See merge request gitlab-org/gitlab-ce!31076
(cherry picked from commit 0a2bbc9267e5aca220cda17f13e6f62bae7f1f1b)
2bc43c44 Fix incorrect web server parameter in init.d script
| -rwxr-xr-x | lib/support/init.d/gitlab | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab index 32df74f104a..bccb94ff0bf 100755 --- a/lib/support/init.d/gitlab +++ b/lib/support/init.d/gitlab @@ -67,6 +67,13 @@ if ! cd "$app_root" ; then echo "Failed to cd into $app_root, exiting!"; exit 1 fi +# Select the web server to use +if [ -z "$EXPERIMENTAL_PUMA" ]; then + use_web_server="unicorn" +else + use_web_server="puma" +fi + ### Init Script functions @@ -256,7 +263,7 @@ start_gitlab() { check_stale_pids if [ "$web_status" != "0" ]; then - echo "Starting GitLab web server" + echo "Starting GitLab web server ($use_web_server)" fi if [ "$sidekiq_status" != "0" ]; then echo "Starting GitLab Sidekiq" @@ -281,7 +288,7 @@ start_gitlab() { # Remove old socket if it exists rm -f "$rails_socket" 2>/dev/null # Start the web server - RAILS_ENV=$RAILS_ENV EXPERIMENTAL_PUMA=$EXPERIMENTAL_PUMA bin/web start + RAILS_ENV=$RAILS_ENV USE_WEB_SERVER=$use_web_server bin/web start fi # If sidekiq is already running, don't start it again. @@ -343,7 +350,7 @@ stop_gitlab() { if [ "$web_status" = "0" ]; then echo "Shutting down GitLab web server" - RAILS_ENV=$RAILS_ENV EXPERIMENTAL_PUMA=$EXPERIMENTAL_PUMA bin/web stop + RAILS_ENV=$RAILS_ENV USE_WEB_SERVER=$use_web_server bin/web stop fi if [ "$sidekiq_status" = "0" ]; then echo "Shutting down GitLab Sidekiq" @@ -447,7 +454,7 @@ reload_gitlab(){ exit 1 fi printf "Reloading GitLab web server configuration... " - RAILS_ENV=$RAILS_ENV EXPERIMENTAL_PUMA=$EXPERIMENTAL_PUMA bin/web reload + RAILS_ENV=$RAILS_ENV USE_WEB_SERVER=$use_web_server bin/web reload echo "Done." echo "Restarting GitLab Sidekiq since it isn't capable of reloading its config..." |