summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2016-01-14 15:08:15 +0100
committerJacob Vosmaer <contact@jacobvosmaer.nl>2016-01-14 15:08:15 +0100
commit66f28577adc8fef997913cd05ae5884777010cb5 (patch)
tree1f0d434db87c01f1a2e094b136b5d8327d7f10fd /bin
parente85faec90e555a79588e185d81403ab371b4924f (diff)
downloadgitlab-ce-66f28577adc8fef997913cd05ae5884777010cb5.tar.gz
Improve bin/ launchers
Diffstat (limited to 'bin')
-rwxr-xr-xbin/background_jobs7
-rwxr-xr-xbin/web11
2 files changed, 15 insertions, 3 deletions
diff --git a/bin/background_jobs b/bin/background_jobs
index 5c85fb339e6..5740539cb85 100755
--- a/bin/background_jobs
+++ b/bin/background_jobs
@@ -32,12 +32,12 @@ restart()
start_no_deamonize()
{
- start_sidekiq
+ start_sidekiq >> $sidekiq_logfile 2>&1
}
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()
@@ -66,6 +66,9 @@ case "$1" in
start_no_deamonize)
start_no_deamonize
;;
+ start_foreground)
+ start_sidekiq
+ ;;
restart)
restart
;;
diff --git a/bin/web b/bin/web
index 67f236eb0bb..03fe7a6354b 100755
--- a/bin/web
+++ b/bin/web
@@ -5,6 +5,7 @@ app_root=$(pwd)
unicorn_pidfile="$app_root/tmp/pids/unicorn.pid"
unicorn_config="$app_root/config/unicorn.rb"
+unicorn_cmd="bundle exec unicorn_rails -c $unicorn_config -E $RAILS_ENV"
get_unicorn_pid()
{
@@ -18,7 +19,12 @@ get_unicorn_pid()
start()
{
- bundle exec unicorn_rails -D -c $unicorn_config -E $RAILS_ENV
+ $unicorn_cmd -D
+}
+
+start_foreground()
+{
+ $unicorn_cmd
}
stop()
@@ -37,6 +43,9 @@ case "$1" in
start)
start
;;
+ start_foreground)
+ start_foreground
+ ;;
stop)
stop
;;