commit 13dc24ec0d2495126a85c6b65ac4e40092fdd698
Author: Elan Ruusamäe <[email protected]>
Date: Sat Nov 11 18:46:25 2017 +0200
initscripts: force RC_LOGGING off
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 | 5 +++--
gitlab-unicorn.init | 4 +++-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/gitlab-sidekiq.init b/gitlab-sidekiq.init
index 8154674..f2294ec 100755
--- a/gitlab-sidekiq.init
+++ b/gitlab-sidekiq.init
@@ -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
diff --git a/gitlab-unicorn.init b/gitlab-unicorn.init
index ebed4d8..a76444b 100755
--- a/gitlab-unicorn.init
+++ b/gitlab-unicorn.init
@@ -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
}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ce.git/commitdiff/13dc24ec0d2495126a85c6b65ac4e40092fdd698
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
