summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/background_jobs18
-rwxr-xr-xbin/web10
2 files changed, 14 insertions, 14 deletions
diff --git a/bin/background_jobs b/bin/background_jobs
index 71bf6d5e644..b58cdce4f9f 100755
--- a/bin/background_jobs
+++ b/bin/background_jobs
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
cd $(dirname $0)/..
app_root=$(pwd)
@@ -6,22 +6,22 @@ sidekiq_pidfile="$app_root/tmp/pids/sidekiq.pid"
sidekiq_logfile="$app_root/log/sidekiq.log"
gitlab_user=$(ls -l config.ru | awk '{print $3}')
-function warn
+warn()
{
echo "$@" 1>&2
}
-function stop
+stop()
{
bundle exec sidekiqctl stop $sidekiq_pidfile >> $sidekiq_logfile 2>&1
}
-function killall
+killall()
{
pkill -u $gitlab_user -f 'sidekiq [0-9]'
}
-function restart
+restart()
{
if [ -f $sidekiq_pidfile ]; then
stop
@@ -30,20 +30,20 @@ function restart
start_sidekiq -d -L $sidekiq_logfile
}
-function start_no_deamonize
+start_no_deamonize()
{
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
}
-function load_ok
+load_ok()
{
sidekiq_pid=$(cat $sidekiq_pidfile)
- if [[ -z $sidekiq_pid ]] ; then
+ if [ -z $sidekiq_pid ] ; then
warn "Could not find a PID in $sidekiq_pidfile"
exit 0
fi
diff --git a/bin/web b/bin/web
index 1ad3b5d24b9..f6bacd6d784 100755
--- a/bin/web
+++ b/bin/web
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
cd $(dirname $0)/..
app_root=$(pwd)
@@ -6,7 +6,7 @@ app_root=$(pwd)
unicorn_pidfile="$app_root/tmp/pids/unicorn.pid"
unicorn_config="$app_root/config/unicorn.rb"
-function get_unicorn_pid
+get_unicorn_pid()
{
local pid=$(cat $unicorn_pidfile)
if [ -z $pid ] ; then
@@ -16,18 +16,18 @@ function get_unicorn_pid
unicorn_pid=$pid
}
-function start
+start()
{
bundle exec unicorn_rails -D -c $unicorn_config -E $RAILS_ENV
}
-function stop
+stop()
{
get_unicorn_pid
kill -QUIT $unicorn_pid
}
-function reload
+reload()
{
get_unicorn_pid
kill -USR2 $unicorn_pid