diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2021-10-28 14:43:31 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2021-10-29 06:33:39 +0000 |
| commit | 12cce839321eee9e5c745a71af56c8bdf556da39 (patch) | |
| tree | 7bffb53fdabcf430fff679a68a1a129ad6aedd06 | |
| parent | fcfd49ce7c4f924f4ba517114609662d030357b1 (diff) | |
| download | ports-12cce839321eee9e5c745a71af56c8bdf556da39.tar.gz ports-12cce839321eee9e5c745a71af56c8bdf556da39.zip | |
www/gitlab-ce: Fix sidekiq-cron problem disable log to console
The FreeBSD ports is having sidekiq-cron gem version 1.2 which is not
compatible with gitlab yet.
See issue:
https://gitlab.com/gitlab-org/gitlab/-/issues/343695
Following MR is included:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73093
5 files changed, 35 insertions, 3 deletions
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index c572fe269d11..159e6f139c1b 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -2,7 +2,7 @@ PORTNAME= gitlab-ce PORTVERSION= 14.4.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org diff --git a/www/gitlab-ce/files/patch-bin_background__jobs b/www/gitlab-ce/files/patch-bin_background__jobs new file mode 100644 index 000000000000..8ede44b924f3 --- /dev/null +++ b/www/gitlab-ce/files/patch-bin_background__jobs @@ -0,0 +1,11 @@ +--- bin/background_jobs.orig 2021-10-27 21:39:44 UTC ++++ bin/background_jobs +@@ -56,7 +56,7 @@ start_sidekiq() + 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 + } + + action="$1" diff --git a/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_json__formatter.rb b/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_json__formatter.rb new file mode 100644 index 000000000000..a45a225aff28 --- /dev/null +++ b/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_json__formatter.rb @@ -0,0 +1,10 @@ +--- lib/gitlab/sidekiq_logging/json_formatter.rb.orig 2021-10-27 21:47:49 UTC ++++ lib/gitlab/sidekiq_logging/json_formatter.rb +@@ -2,6 +2,7 @@ + + # This is needed for sidekiq-cluster + require 'json' ++require 'sidekiq/job_retry' + + module Gitlab + module SidekiqLogging diff --git a/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_structured__logger.rb b/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_structured__logger.rb index 46586cc70edf..2d9478dd9e6f 100644 --- a/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_structured__logger.rb +++ b/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_structured__logger.rb @@ -1,10 +1,11 @@ ---- lib/gitlab/sidekiq_logging/structured_logger.rb.orig 2021-10-26 19:13:52 UTC +--- lib/gitlab/sidekiq_logging/structured_logger.rb.orig 2021-10-21 22:00:37 UTC +++ lib/gitlab/sidekiq_logging/structured_logger.rb -@@ -2,6 +2,7 @@ +@@ -2,6 +2,8 @@ require 'active_record' require 'active_record/log_subscriber' +require 'sidekiq/job_logger' ++require 'sidekiq/job_retry' module Gitlab module SidekiqLogging diff --git a/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__middleware_monitor.rb b/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__middleware_monitor.rb new file mode 100644 index 000000000000..e81c96f18ce0 --- /dev/null +++ b/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__middleware_monitor.rb @@ -0,0 +1,10 @@ +--- lib/gitlab/sidekiq_middleware/monitor.rb.orig 2021-10-27 21:57:04 UTC ++++ lib/gitlab/sidekiq_middleware/monitor.rb +@@ -1,5 +1,7 @@ + # frozen_string_literal: true + ++require 'sidekiq/job_retry' ++ + module Gitlab + module SidekiqMiddleware + class Monitor |