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
Kazuhiko Shiozaki
gitlab-ce
Commits
66f28577
Commit
66f28577
authored
Jan 14, 2016
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve bin/ launchers
parent
e85faec9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
3 deletions
+15
-3
bin/background_jobs
bin/background_jobs
+5
-2
bin/web
bin/web
+10
-1
No files found.
bin/background_jobs
View file @
66f28577
...
@@ -32,12 +32,12 @@ restart()
...
@@ -32,12 +32,12 @@ restart()
start_no_deamonize
()
start_no_deamonize
()
{
{
start_sidekiq
start_sidekiq
>>
$sidekiq_logfile
2>&1
}
}
start_sidekiq
()
start_sidekiq
()
{
{
bundle
exec
sidekiq
-q
post_receive
-q
mailers
-q
archive_repo
-q
system_hook
-q
project_web_hook
-q
gitlab_shell
-q
incoming_email
-q
runner
-q
common
-q
default
-e
$RAILS_ENV
-P
$sidekiq_pidfile
$@
>>
$sidekiq_logfile
2>&1
bundle
exec
sidekiq
-q
post_receive
-q
mailers
-q
archive_repo
-q
system_hook
-q
project_web_hook
-q
gitlab_shell
-q
incoming_email
-q
runner
-q
common
-q
default
-e
$RAILS_ENV
-P
$sidekiq_pidfile
"
$@
"
}
}
load_ok
()
load_ok
()
...
@@ -66,6 +66,9 @@ case "$1" in
...
@@ -66,6 +66,9 @@ case "$1" in
start_no_deamonize
)
start_no_deamonize
)
start_no_deamonize
start_no_deamonize
;;
;;
start_foreground
)
start_sidekiq
;;
restart
)
restart
)
restart
restart
;;
;;
...
...
bin/web
View file @
66f28577
...
@@ -5,6 +5,7 @@ app_root=$(pwd)
...
@@ -5,6 +5,7 @@ app_root=$(pwd)
unicorn_pidfile
=
"
$app_root
/tmp/pids/unicorn.pid"
unicorn_pidfile
=
"
$app_root
/tmp/pids/unicorn.pid"
unicorn_config
=
"
$app_root
/config/unicorn.rb"
unicorn_config
=
"
$app_root
/config/unicorn.rb"
unicorn_cmd
=
"bundle exec unicorn_rails -c
$unicorn_config
-E
$RAILS_ENV
"
get_unicorn_pid
()
get_unicorn_pid
()
{
{
...
@@ -18,7 +19,12 @@ get_unicorn_pid()
...
@@ -18,7 +19,12 @@ get_unicorn_pid()
start
()
start
()
{
{
bundle
exec
unicorn_rails
-D
-c
$unicorn_config
-E
$RAILS_ENV
$unicorn_cmd
-D
}
start_foreground
()
{
$unicorn_cmd
}
}
stop
()
stop
()
...
@@ -37,6 +43,9 @@ case "$1" in
...
@@ -37,6 +43,9 @@ case "$1" in
start
)
start
)
start
start
;;
;;
start_foreground
)
start_foreground
;;
stop
)
stop
)
stop
stop
;;
;;
...
...
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