[packages/gitlab-ce] gitlab-sidekiq/gitlab-unicorn: cleanup unused reload, fix pidfile and status
glen
glen at pld-linux.org
Sun May 15 09:46:40 CEST 2016
commit 9003de5f4175fc6cc092100255916a8747a742ca
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun May 15 10:42:52 2016 +0300
gitlab-sidekiq/gitlab-unicorn: cleanup unused reload, fix pidfile and status
gitlab-sidekiq.init | 17 ++---------------
gitlab-unicorn.init | 17 ++---------------
2 files changed, 4 insertions(+), 30 deletions(-)
---
diff --git a/gitlab-sidekiq.init b/gitlab-sidekiq.init
index 9b06a4c..be1f50d 100755
--- a/gitlab-sidekiq.init
+++ b/gitlab-sidekiq.init
@@ -34,7 +34,7 @@ USER=git
APP_PATH=/var/lib/gitlab
# The PID and LOCK files used by unicorn and sidekiq
-pidfile=$APP_PATH/tmp/pids/sidekiq.pid
+pidfile=$APP_PATH/pids/sidekiq.pid
lockfile=/var/lock/subsys/gitlab-sidekiq
# Get service config - may override defaults
@@ -67,19 +67,6 @@ stop() {
rm -f $lockfile
}
-reload() {
- if [ ! -f $lockfile ]; then
- msg_not_running "GitLab Sidekiq"
- RETVAL=7
- return
- fi
-
- msg_reloading "GitLab Sidekiq"
- killproc <procname> -HUP
- killproc --pidfile $pidfile <procname> -HUP
- RETVAL=$?
-}
-
condrestart() {
if [ ! -f $lockfile ]; then
msg_not_running "GitLab Sidekiq"
@@ -111,7 +98,7 @@ case "$1" in
condrestart 7
;;
status)
- status --pidfile $pidfile gitlab-sidekiq
+ status --pidfile $pidfile sidekiq
RETVAL=$?
;;
*)
diff --git a/gitlab-unicorn.init b/gitlab-unicorn.init
index 192f7ee..3b99c3c 100755
--- a/gitlab-unicorn.init
+++ b/gitlab-unicorn.init
@@ -34,7 +34,7 @@ USER=git
APP_PATH=/var/lib/gitlab
# The PID and LOCK files used by unicorn and sidekiq
-pidfile=$APP_PATH/tmp/pids/unicorn.pid
+pidfile=$APP_PATH/pids/unicorn.pid
lockfile=/var/lock/subsys/gitlab-unicorn
# Get service config - may override defaults
@@ -66,19 +66,6 @@ stop() {
rm -f $lockfile
}
-reload() {
- if [ ! -f $lockfile ]; then
- msg_not_running "GitLab Unicorn"
- RETVAL=7
- return
- fi
-
- msg_reloading "GitLab Unicorn"
- killproc <procname> -HUP
- killproc --pidfile $pidfile <procname> -HUP
- RETVAL=$?
-}
-
condrestart() {
if [ ! -f $lockfile ]; then
msg_not_running "GitLab Unicorn"
@@ -110,7 +97,7 @@ case "$1" in
condrestart 7
;;
status)
- status --pidfile $pidfile unicorn
+ status --pidfile $pidfile unicorn_rails
RETVAL=$?
;;
*)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ce.git/commitdiff/9003de5f4175fc6cc092100255916a8747a742ca
More information about the pld-cvs-commit
mailing list