Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
c73bf281
Commit
c73bf281
authored
Jan 20, 2016
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace gitlab-workhorse with GitLab Workhorse where appropriate
parent
872e8548
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
lib/support/init.d/gitlab
lib/support/init.d/gitlab
+6
-6
No files found.
lib/support/init.d/gitlab
View file @
c73bf281
...
@@ -173,7 +173,7 @@ check_stale_pids(){
...
@@ -173,7 +173,7 @@ check_stale_pids(){
fi
fi
fi
fi
if
[
"
$hpid
"
!=
"0"
]
&&
[
"
$gitlab_workhorse_status
"
!=
"0"
]
;
then
if
[
"
$hpid
"
!=
"0"
]
&&
[
"
$gitlab_workhorse_status
"
!=
"0"
]
;
then
echo
"Removing stale
gitlab-workhorse pid. This is most likely caused by gitlab-w
orkhorse crashing the last time it ran."
echo
"Removing stale
GitLab Workhorse pid. This is most likely caused by GitLab W
orkhorse crashing the last time it ran."
if
!
rm
"
$gitlab_workhorse_pid_path
"
;
then
if
!
rm
"
$gitlab_workhorse_pid_path
"
;
then
echo
"Unable to remove stale pid, exiting"
echo
"Unable to remove stale pid, exiting"
exit
1
exit
1
...
@@ -208,7 +208,7 @@ start_gitlab() {
...
@@ -208,7 +208,7 @@ start_gitlab() {
echo
"Starting GitLab Sidekiq"
echo
"Starting GitLab Sidekiq"
fi
fi
if
[
"
$gitlab_workhorse_status
"
!=
"0"
]
;
then
if
[
"
$gitlab_workhorse_status
"
!=
"0"
]
;
then
echo
"Starting
gitlab-w
orkhorse"
echo
"Starting
GitLab W
orkhorse"
fi
fi
if
[
"
$mail_room_enabled
"
=
true
]
&&
[
"
$mail_room_status
"
!=
"0"
]
;
then
if
[
"
$mail_room_enabled
"
=
true
]
&&
[
"
$mail_room_status
"
!=
"0"
]
;
then
echo
"Starting GitLab MailRoom"
echo
"Starting GitLab MailRoom"
...
@@ -232,7 +232,7 @@ start_gitlab() {
...
@@ -232,7 +232,7 @@ start_gitlab() {
fi
fi
if
[
"
$gitlab_workhorse_status
"
=
"0"
]
;
then
if
[
"
$gitlab_workhorse_status
"
=
"0"
]
;
then
echo
"The
gitlab-w
orkhorse is already running with pid
$spid
, not restarting"
echo
"The
GitLab W
orkhorse is already running with pid
$spid
, not restarting"
else
else
# No need to remove a socket, gitlab-workhorse does this itself.
# No need to remove a socket, gitlab-workhorse does this itself.
# Because gitlab-workhorse has multiple executables we need to fix
# Because gitlab-workhorse has multiple executables we need to fix
...
@@ -271,7 +271,7 @@ stop_gitlab() {
...
@@ -271,7 +271,7 @@ stop_gitlab() {
RAILS_ENV
=
$RAILS_ENV
bin/background_jobs stop
RAILS_ENV
=
$RAILS_ENV
bin/background_jobs stop
fi
fi
if
[
"
$gitlab_workhorse_status
"
=
"0"
]
;
then
if
[
"
$gitlab_workhorse_status
"
=
"0"
]
;
then
echo
"Shutting down
gitlab-w
orkhorse"
echo
"Shutting down
GitLab W
orkhorse"
kill
--
$(
cat
$gitlab_workhorse_pid_path
)
kill
--
$(
cat
$gitlab_workhorse_pid_path
)
fi
fi
if
[
"
$mail_room_enabled
"
=
true
]
&&
[
"
$mail_room_status
"
=
"0"
]
;
then
if
[
"
$mail_room_enabled
"
=
true
]
&&
[
"
$mail_room_status
"
=
"0"
]
;
then
...
@@ -320,9 +320,9 @@ print_status() {
...
@@ -320,9 +320,9 @@ print_status() {
printf
"The GitLab Sidekiq job dispatcher is
\0
33[31mnot running
\0
33[0m.
\n
"
printf
"The GitLab Sidekiq job dispatcher is
\0
33[31mnot running
\0
33[0m.
\n
"
fi
fi
if
[
"
$gitlab_workhorse_status
"
=
"0"
]
;
then
if
[
"
$gitlab_workhorse_status
"
=
"0"
]
;
then
echo
"The
gitlab-w
orkhorse with pid
$hpid
is running."
echo
"The
GitLab W
orkhorse with pid
$hpid
is running."
else
else
printf
"The
gitlab-w
orkhorse is
\0
33[31mnot running
\0
33[0m.
\n
"
printf
"The
GitLab W
orkhorse is
\0
33[31mnot running
\0
33[0m.
\n
"
fi
fi
if
[
"
$mail_room_enabled
"
=
true
]
;
then
if
[
"
$mail_room_enabled
"
=
true
]
;
then
if
[
"
$mail_room_status
"
=
"0"
]
;
then
if
[
"
$mail_room_status
"
=
"0"
]
;
then
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment