Commit 494d15cf authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge pull request #7258 from presto53/fix_init_scripts_interpreter

change bash to sh in web, background_jobs scripts
parents b712ded1 7dd0646e
#!/usr/bin/env bash #!/bin/sh
cd $(dirname $0)/.. cd $(dirname $0)/..
app_root=$(pwd) app_root=$(pwd)
...@@ -6,22 +6,22 @@ sidekiq_pidfile="$app_root/tmp/pids/sidekiq.pid" ...@@ -6,22 +6,22 @@ sidekiq_pidfile="$app_root/tmp/pids/sidekiq.pid"
sidekiq_logfile="$app_root/log/sidekiq.log" sidekiq_logfile="$app_root/log/sidekiq.log"
gitlab_user=$(ls -l config.ru | awk '{print $3}') gitlab_user=$(ls -l config.ru | awk '{print $3}')
function warn warn()
{ {
echo "$@" 1>&2 echo "$@" 1>&2
} }
function stop stop()
{ {
bundle exec sidekiqctl stop $sidekiq_pidfile >> $sidekiq_logfile 2>&1 bundle exec sidekiqctl stop $sidekiq_pidfile >> $sidekiq_logfile 2>&1
} }
function killall killall()
{ {
pkill -u $gitlab_user -f 'sidekiq [0-9]' pkill -u $gitlab_user -f 'sidekiq [0-9]'
} }
function restart restart()
{ {
if [ -f $sidekiq_pidfile ]; then if [ -f $sidekiq_pidfile ]; then
stop stop
...@@ -30,20 +30,20 @@ function restart ...@@ -30,20 +30,20 @@ function restart
start_sidekiq -d -L $sidekiq_logfile start_sidekiq -d -L $sidekiq_logfile
} }
function start_no_deamonize start_no_deamonize()
{ {
start_sidekiq start_sidekiq
} }
function start_sidekiq start_sidekiq()
{ {
bundle exec sidekiq -q post_receive -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e $RAILS_ENV -P $sidekiq_pidfile $@ >> $sidekiq_logfile 2>&1 bundle exec sidekiq -q post_receive -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e $RAILS_ENV -P $sidekiq_pidfile $@ >> $sidekiq_logfile 2>&1
} }
function load_ok load_ok()
{ {
sidekiq_pid=$(cat $sidekiq_pidfile) sidekiq_pid=$(cat $sidekiq_pidfile)
if [[ -z $sidekiq_pid ]] ; then if [ -z $sidekiq_pid ] ; then
warn "Could not find a PID in $sidekiq_pidfile" warn "Could not find a PID in $sidekiq_pidfile"
exit 0 exit 0
fi fi
......
#!/usr/bin/env bash #!/bin/sh
cd $(dirname $0)/.. cd $(dirname $0)/..
app_root=$(pwd) app_root=$(pwd)
...@@ -6,7 +6,7 @@ app_root=$(pwd) ...@@ -6,7 +6,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"
function get_unicorn_pid get_unicorn_pid()
{ {
local pid=$(cat $unicorn_pidfile) local pid=$(cat $unicorn_pidfile)
if [ -z $pid ] ; then if [ -z $pid ] ; then
...@@ -16,18 +16,18 @@ function get_unicorn_pid ...@@ -16,18 +16,18 @@ function get_unicorn_pid
unicorn_pid=$pid unicorn_pid=$pid
} }
function start start()
{ {
bundle exec unicorn_rails -D -c $unicorn_config -E $RAILS_ENV bundle exec unicorn_rails -D -c $unicorn_config -E $RAILS_ENV
} }
function stop stop()
{ {
get_unicorn_pid get_unicorn_pid
kill -QUIT $unicorn_pid kill -QUIT $unicorn_pid
} }
function reload reload()
{ {
get_unicorn_pid get_unicorn_pid
kill -USR2 $unicorn_pid kill -USR2 $unicorn_pid
......
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