Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 87 deletions

diff --git a/bin/background_jobs b/bin/background_jobs
index 06f26df5409..b3d7cc04d4f 100755
--- a/bin/background_jobs
+++ b/bin/background_jobs
@@ -1,91 +1,9 @@
 #!/bin/sh
 
 cd $(dirname $0)/..
-app_root=$(pwd)
-sidekiq_pidfile="$app_root/tmp/pids/sidekiq.pid"
-sidekiq_logfile="$app_root/log/sidekiq.log"
-sidekiq_config="$app_root/config/sidekiq_queues.yml"
-gitlab_user=$(ls -l config.ru | awk '{print $3}')
 
-warn()
-{
-  echo "$@" 1>&2
-}
-
-stop()
-{
-  bundle exec sidekiqctl stop $sidekiq_pidfile >> $sidekiq_logfile 2>&1
-}
-
-killall()
-{
-  pkill -u $gitlab_user -f 'sidekiq [0-9]'
-}
-
-restart()
-{
-  if [ -f $sidekiq_pidfile ]; then
-    stop
-  fi
-  killall
-  start_sidekiq -P $sidekiq_pidfile -d -L $sidekiq_logfile >> $sidekiq_logfile 2>&1
-}
-
-start_no_deamonize()
-{
-  start_sidekiq >> $sidekiq_logfile 2>&1
-}
-
-start_sidekiq()
-{
-  cmd="exec"
-  chpst=$(which chpst)
-
-  if [ -n "$chpst" ]; then
-    cmd="${cmd} ${chpst} -P"
-  fi
-
-  ${cmd} bundle exec sidekiq -C "${sidekiq_config}" -e $RAILS_ENV "$@"
-}
-
-load_ok()
-{
-  sidekiq_pid=$(cat $sidekiq_pidfile)
-  if [ -z "$sidekiq_pid" ] ; then
-    warn "Could not find a PID in $sidekiq_pidfile"
-    exit 0
-  fi
-
-  if (ps -p $sidekiq_pid -o args | grep '\([0-9]\+\) of \1 busy' 1>&2) ; then
-    warn "Too many busy Sidekiq workers"
-    exit 1
-  fi
-
-  exit 0
-}
-
-case "$1" in
-  stop)
-    stop
-    ;;
-  start)
-    restart
-    ;;
-  start_no_deamonize)
-    start_no_deamonize
-    ;;
-  start_foreground)
-    start_sidekiq
-    ;;
-  restart)
-    restart
-    ;;
-  killall)
-    killall
-    ;;
-  load_ok)
-    load_ok
-    ;;
-  *)
-    echo "Usage: RAILS_ENV=your_env $0 {stop|start|start_no_deamonize|restart|killall|load_ok}"
-esac
+if [ -n "$SIDEKIQ_WORKERS" ] ; then
+  exec bin/background_jobs_sk_cluster "$@"
+else
+  exec bin/background_jobs_sk "$@"
+fi