diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /www/gitlab/files/patch-bin_background__jobs | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'www/gitlab/files/patch-bin_background__jobs')
| -rw-r--r-- | www/gitlab/files/patch-bin_background__jobs | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/www/gitlab/files/patch-bin_background__jobs b/www/gitlab/files/patch-bin_background__jobs index 552f9367a5ce..532332130faa 100644 --- a/www/gitlab/files/patch-bin_background__jobs +++ b/www/gitlab/files/patch-bin_background__jobs @@ -1,11 +1,23 @@ ---- bin/background_jobs.orig 2021-12-01 10:42:56 UTC +--- bin/background_jobs.orig 2025-10-21 19:12:22 UTC +++ bin/background_jobs -@@ -58,7 +58,7 @@ start_sidekiq() +@@ -49,19 +49,14 @@ start_sidekiq() + start_sidekiq() + { + cmd="exec" +- chpst=$(command -v chpst) + +- if [ -n "$chpst" ]; then +- cmd="${cmd} ${chpst} -P" +- fi +- + # sidekiq-cluster expects an argument per process. + for (( i=1; i<=sidekiq_workers; i++ )) + do processes_args+=("${sidekiq_queues}") done -- ${cmd} bin/sidekiq-cluster "${processes_args[@]}" -P $sidekiq_pidfile -e $RAILS_ENV "$@" 2>&1 | tee -a $sidekiq_logfile -+ ${cmd} bin/sidekiq-cluster "${processes_args[@]}" -P $sidekiq_pidfile -e $RAILS_ENV "$@" 2>&1 >> $sidekiq_logfile +- ${cmd} bin/sidekiq-cluster "${processes_args[@]}" -P "$sidekiq_pidfile" -e "$RAILS_ENV" "$@" 2>&1 | tee -a "$sidekiq_logfile" ++ ${cmd} bin/sidekiq-cluster "${processes_args[@]}" -P "$sidekiq_pidfile" -e "$RAILS_ENV" "$@" 2>&1 >> "$sidekiq_logfile" } cleanup() |