BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
94149f8e
Commit
94149f8e
authored
Jul 12, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4324 from axilleas/initd_script
Removal of gitlab.socket should be in stop function too. Fix #4313
parents
d938486c
ec38d629
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
gitlab
lib/support/init.d/gitlab
+5
-3
No files found.
lib/support/init.d/gitlab
View file @
94149f8e
...
@@ -20,6 +20,7 @@ APP_USER="git"
...
@@ -20,6 +20,7 @@ APP_USER="git"
DAEMON_OPTS
=
"-C
$APP_ROOT
/config/puma.rb"
DAEMON_OPTS
=
"-C
$APP_ROOT
/config/puma.rb"
PID_PATH
=
"
$APP_ROOT
/tmp/pids"
PID_PATH
=
"
$APP_ROOT
/tmp/pids"
SOCKET_PATH
=
"
$APP_ROOT
/tmp/sockets"
SOCKET_PATH
=
"
$APP_ROOT
/tmp/sockets"
SOCKET_FILE
=
"
$SOCKET_PATH
/gitlab.socket"
WEB_SERVER_PID
=
"
$PID_PATH
/puma.pid"
WEB_SERVER_PID
=
"
$PID_PATH
/puma.pid"
SIDEKIQ_PID
=
"
$PID_PATH
/sidekiq.pid"
SIDEKIQ_PID
=
"
$PID_PATH
/sidekiq.pid"
STOP_SIDEKIQ
=
"RAILS_ENV=production bundle exec rake sidekiq:stop"
STOP_SIDEKIQ
=
"RAILS_ENV=production bundle exec rake sidekiq:stop"
...
@@ -51,7 +52,7 @@ start() {
...
@@ -51,7 +52,7 @@ start() {
exit
1
exit
1
else
else
if
[
`
whoami
`
=
root
]
;
then
if
[
`
whoami
`
=
root
]
;
then
execute
"rm -f
$SOCKET_PATH
/gitlab.socket
"
!
[
-e
$SOCKET_FILE
]
||
execute
"rm
$SOCKET_FILE
"
execute
"RAILS_ENV=production bundle exec puma
$DAEMON_OPTS
"
execute
"RAILS_ENV=production bundle exec puma
$DAEMON_OPTS
"
execute
"mkdir -p
$PID_PATH
&&
$START_SIDEKIQ
> /dev/null 2>&1 &"
execute
"mkdir -p
$PID_PATH
&&
$START_SIDEKIQ
> /dev/null 2>&1 &"
echo
"
$DESC
started"
echo
"
$DESC
started"
...
@@ -65,12 +66,13 @@ stop() {
...
@@ -65,12 +66,13 @@ stop() {
if
[
"
$PID
"
-ne
0
-a
"
$STATUS
"
-ne
0
]
;
then
if
[
"
$PID
"
-ne
0
-a
"
$STATUS
"
-ne
0
]
;
then
## Program is running, stop it.
## Program is running, stop it.
kill
-QUIT
`
cat
$WEB_SERVER_PID
`
kill
-QUIT
`
cat
$WEB_SERVER_PID
`
!
[
-e
$SOCKET_FILE
]
||
execute
"rm
$SOCKET_FILE
"
execute
"mkdir -p
$PID_PATH
&&
$STOP_SIDEKIQ
> /dev/null 2>&1 &"
execute
"mkdir -p
$PID_PATH
&&
$STOP_SIDEKIQ
> /dev/null 2>&1 &"
rm
"
$WEB_SERVER_PID
"
>>
/dev/null
rm
"
$WEB_SERVER_PID
"
>>
/dev/null
echo
"
$DESC
stopped"
echo
"
$DESC
stopped"
else
else
## Program is not running, exit with error.
## Program is not running, exit with error.
echo
"Error!
$DESC
not started!"
echo
"Error!
$DESC
is
not started!"
exit
1
exit
1
fi
fi
}
}
...
@@ -81,7 +83,7 @@ restart() {
...
@@ -81,7 +83,7 @@ restart() {
if
[
"
$PID
"
-ne
0
-a
"
$STATUS
"
-ne
0
]
;
then
if
[
"
$PID
"
-ne
0
-a
"
$STATUS
"
-ne
0
]
;
then
echo
"Restarting
$DESC
..."
echo
"Restarting
$DESC
..."
kill
-USR2
`
cat
$WEB_SERVER_PID
`
kill
-USR2
`
cat
$WEB_SERVER_PID
`
execute
"mkdir -p
$PID_PATH
&&
$STOP_SIDEKIQ
> /dev/null 2>&1
&
"
execute
"mkdir -p
$PID_PATH
&&
$STOP_SIDEKIQ
> /dev/null 2>&1"
if
[
`
whoami
`
=
root
]
;
then
if
[
`
whoami
`
=
root
]
;
then
execute
"mkdir -p
$PID_PATH
&&
$START_SIDEKIQ
> /dev/null 2>&1 &"
execute
"mkdir -p
$PID_PATH
&&
$START_SIDEKIQ
> /dev/null 2>&1 &"
fi
fi
...
...
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