]> git.pld-linux.org Git - packages/gitlab-ce.git/commitdiff
initscripts: force RC_LOGGING off
authorElan Ruusamäe <glen@pld-linux.org>
Sat, 11 Nov 2017 16:46:25 +0000 (18:46 +0200)
committerElan Ruusamäe <glen@pld-linux.org>
Sat, 11 Nov 2017 16:48:23 +0000 (18:48 +0200)
no idea wtf initlog program is doing, but it's making daemons kill
themselves when initlog has waited for them to start up.

initlog(1) must die!

gitlab-sidekiq.init
gitlab-unicorn.init

index 8154674e48df4d01f98fd9f8856bf2c125bb25c0..f2294ec4315d8a4f2344d140c56f2b09286b7ff1 100755 (executable)
@@ -48,8 +48,9 @@ start() {
        fi
 
        msg_starting "GitLab Sidekiq"
+       RC_LOGGING=no
        daemon --pidfile $pidfile --user $USER --chdir "$APP_PATH" \
-               env RAILS_ENV=$RAILS_ENV \
+               /usr/bin/env RAILS_ENV=$RAILS_ENV \
                bin/background_jobs start
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch $lockfile
@@ -64,7 +65,7 @@ stop() {
        # Stop daemons.
        msg_stopping "GitLab Sidekiq"
        daemon --pidfile $pidfile --user $USER --chdir "$APP_PATH" \
-               env RAILS_ENV=$RAILS_ENV \
+               /usr/bin/env RAILS_ENV=$RAILS_ENV \
                bin/background_jobs stop
        RETVAL=$?
        rm -f $lockfile
index ebed4d8972b4d377bfc847750d8c48dc6b804a58..a76444b6a3391d08d937e4bb8272abb73829a6dc 100755 (executable)
@@ -48,8 +48,10 @@ start() {
        fi
 
        msg_starting "GitLab Unicorn"
+       RC_LOGGING=no
        daemon --pidfile $pidfile --user $USER --chdir "$APP_PATH" \
-               "env RAILS_ENV=$RAILS_ENV bin/web start"
+               /usr/bin/env RAILS_ENV=$RAILS_ENV \
+               bin/web start
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch $lockfile
 }
This page took 0.099137 seconds and 4 git commands to generate.