Commit aeb5ef20 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'simplify-procfile' into 'master'

Simplify Procfile

These changes are meant to make development easier.

[ci skip]

See merge request !2429
parents 20106834 d28332cc
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
# https://gitlab.com/gitlab-org/omnibus-gitlab or the init scripts in # https://gitlab.com/gitlab-org/omnibus-gitlab or the init scripts in
# lib/support/init.d, which call scripts in bin/ . # lib/support/init.d, which call scripts in bin/ .
# #
web: bundle exec unicorn_rails -p ${PORT:="3000"} -E ${RAILS_ENV:="development"} -c ${UNICORN_CONFIG:="config/unicorn.rb"} web: RAILS_ENV=development bin/web start_foreground
worker: 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 worker: RAILS_ENV=development bin/background_jobs start_foreground
# mail_room: bundle exec mail_room -q -c config/mail_room.yml # mail_room: bundle exec mail_room -q -c config/mail_room.yml
...@@ -27,17 +27,17 @@ restart() ...@@ -27,17 +27,17 @@ restart()
stop stop
fi fi
killall killall
start_sidekiq -d -L $sidekiq_logfile start_sidekiq -d -L $sidekiq_logfile >> $sidekiq_logfile 2>&1
} }
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
;; ;;
......
...@@ -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
;; ;;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment