Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

3 files changed, 11 insertions, 74 deletions

diff --git a/bin/actioncable b/bin/actioncable
deleted file mode 100755
index 14600ec1177..00000000000
--- a/bin/actioncable
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)/..
-app_root=$(pwd)
-
-puma_pidfile="$app_root/tmp/pids/puma_actioncable.pid"
-puma_config="$app_root/config/puma_actioncable.rb"
-
-spawn_puma()
-{
-  exec bundle exec puma --config "${puma_config}" --environment "$RAILS_ENV" "$@"
-}
-
-get_puma_pid()
-{
-  pid=$(cat "${puma_pidfile}")
-  if [ -z "$pid" ] ; then
-    echo "Could not find a PID in $puma_pidfile"
-    exit 1
-  fi
-  echo "${pid}"
-}
-
-start()
-{
-  spawn_puma -d
-}
-
-start_foreground()
-{
-  spawn_puma
-}
-
-stop()
-{
-  get_puma_pid
-  kill -INT "$(get_puma_pid)"
-}
-
-reload()
-{
-  kill -USR2 "$(get_puma_pid)"
-}
-
-case "$1" in
-  start)
-    start
-    ;;
-  start_foreground)
-    start_foreground
-    ;;
-  stop)
-    stop
-    ;;
-  reload)
-    reload
-    ;;
-  *)
-    echo "Usage: RAILS_ENV=your_env $0 {start|start_foreground|stop|reload}"
-    ;;
-esac
diff --git a/bin/background_jobs_sk b/bin/background_jobs_sk
index 0aab69126b2..0e9a5365d44 100755
--- a/bin/background_jobs_sk
+++ b/bin/background_jobs_sk
@@ -24,13 +24,13 @@ restart()
   fi
 
   pkill -u $gitlab_user -f 'sidekiq [0-9]'
-  start_sidekiq -P $sidekiq_pidfile -d -L $sidekiq_logfile >> $sidekiq_logfile 2>&1
+  start_sidekiq -P $sidekiq_pidfile -d -L $sidekiq_logfile "$@" >> $sidekiq_logfile 2>&1
 }
 
 # Starts on foreground but output to the logfile instead stdout.
 start_silent()
 {
-  start_sidekiq >> $sidekiq_logfile 2>&1
+  start_sidekiq "$@" >> $sidekiq_logfile 2>&1
 }
 
 start_sidekiq()
@@ -50,17 +50,17 @@ case "$1" in
     stop
     ;;
   start)
-    restart
+    restart "$@"
     ;;
   start_silent)
     warn "Deprecated: Will be removed at 13.0 (see https://gitlab.com/gitlab-org/gitlab/-/issues/196731)."
     start_silent
     ;;
   start_foreground)
-    start_sidekiq
+    start_sidekiq "$@"
     ;;
   restart)
-    restart
+    restart "$@"
     ;;
   *)
     echo "Usage: RAILS_ENV=<env> $0 {stop|start|start_silent|start_foreground|restart}"
diff --git a/bin/background_jobs_sk_cluster b/bin/background_jobs_sk_cluster
index 6188ec51420..d48b5484fce 100755
--- a/bin/background_jobs_sk_cluster
+++ b/bin/background_jobs_sk_cluster
@@ -11,7 +11,7 @@ warn()
   echo "$@" 1>&2
 }
 
-get_sidekiq_pid() 
+get_sidekiq_pid()
 {
   if [ ! -f $sidekiq_pidfile ]; then
     warn "No pidfile found at $sidekiq_pidfile; is Sidekiq running?"
@@ -37,7 +37,7 @@ restart()
   fi
 
   warn "Sidekiq output will be written to $sidekiq_logfile"
-  start_sidekiq >> $sidekiq_logfile 2>&1
+  start_sidekiq "$@" >> $sidekiq_logfile 2>&1
 }
 
 start_sidekiq()
@@ -55,7 +55,7 @@ start_sidekiq()
     processes_args+=("*")
   done
 
-  ${cmd} bin/sidekiq-cluster "${processes_args[@]}" -P $sidekiq_pidfile -e $RAILS_ENV
+  ${cmd} bin/sidekiq-cluster "${processes_args[@]}" -P $sidekiq_pidfile -e $RAILS_ENV "$@"
 }
 
 case "$1" in
@@ -63,13 +63,13 @@ case "$1" in
     stop
     ;;
   start)
-    restart &
+    restart "$@" &
     ;;
   start_foreground)
-    start_sidekiq
+    start_sidekiq "$@"
     ;;
   restart)
-    restart &
+    restart "$@" &
     ;;
   *)
     echo "Usage: RAILS_ENV=<env> SIDEKIQ_WORKERS=<n> $0 {stop|start|start_foreground|restart}"