gitlab-sidekiq/gitlab-unicorn: cleanup unused reload, fix pidfile and status

diff --git a/gitlab-sidekiq.init b/gitlab-sidekiq.init
index 9b06a4c6d2044cfdc1934b9ebaf37711f92f4a99..be1f50d4e2fa903aef0bae170c6181f6e270dcfa 100755 (executable)
--- 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 192f7eede8fead89a7e0f1bbb84e9d460488737c..3b99c3c4bbee3b8db7ccd8a69e2672cbd2eb817c 100755 (executable)
--- 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=$?
        ;;
   *)