summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-08-01 10:13:35 +0000
committerRémy Coutable <remy@rymai.me>2017-08-01 10:13:35 +0000
commit07a4cf41841478f1f48d715d2b3f3bd533363150 (patch)
tree2a56d824bcc02e60aadf4ec89a5b3f3094c9255d
parenteb73e2eb4be308f658b1f1e35ab323a3b9d2e7fb (diff)
parentb5f11ee90ca1d119160c27e5377ce812edaf5848 (diff)
downloadgitlab-ce-07a4cf41841478f1f48d715d2b3f3bd533363150.tar.gz
Merge branch 'patch-25' into 'master'
Invalid variable See merge request !13214
-rwxr-xr-xlib/support/init.d/gitlab6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab
index c5f93336346..2f2de083dc0 100755
--- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab
@@ -291,7 +291,7 @@ start_gitlab() {
fi
if [ "$gitlab_workhorse_status" = "0" ]; then
- echo "The GitLab Workhorse is already running with pid $spid, not restarting"
+ echo "The GitLab Workhorse is already running with pid $hpid, not restarting"
else
# No need to remove a socket, gitlab-workhorse does this itself.
# Because gitlab-workhorse has multiple executables we need to fix
@@ -313,7 +313,7 @@ start_gitlab() {
if [ "$gitlab_pages_enabled" = true ]; then
if [ "$gitlab_pages_status" = "0" ]; then
- echo "The GitLab Pages is already running with pid $spid, not restarting"
+ echo "The GitLab Pages is already running with pid $gppid, not restarting"
else
$app_root/bin/daemon_with_pidfile $gitlab_pages_pid_path \
$gitlab_pages_dir/gitlab-pages $gitlab_pages_options \
@@ -421,7 +421,7 @@ print_status() {
fi
if [ "$gitlab_pages_enabled" = true ]; then
if [ "$gitlab_pages_status" = "0" ]; then
- echo "The GitLab Pages with pid $mpid is running."
+ echo "The GitLab Pages with pid $gppid is running."
else
printf "The GitLab Pages is \033[31mnot running\033[0m.\n"
fi