diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-06 03:08:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-06 03:08:15 +0300 |
commit | 6c36d81714a3ae8ca82186451fffab8bc635ac99 (patch) | |
tree | 8c3977b4ac6aa1ab321b598a080456762294ea22 /bin | |
parent | 353c244f5c32ad3283e9ab6ff4b599f96a010b76 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/background_jobs_sk | 10 | ||||
-rwxr-xr-x | bin/background_jobs_sk_cluster | 12 |
2 files changed, 11 insertions, 11 deletions
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}" |