From nobody Fri Oct 29 06:34:29 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9F67A1820838; Fri, 29 Oct 2021 06:34:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HgXhj3Mxbz3DFq; Fri, 29 Oct 2021 06:34:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5452A12736; Fri, 29 Oct 2021 06:34:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19T6YTL8015596; Fri, 29 Oct 2021 06:34:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19T6YTJ3015595; Fri, 29 Oct 2021 06:34:29 GMT (envelope-from git) Date: Fri, 29 Oct 2021 06:34:29 GMT Message-Id: <202110290634.19T6YTJ3015595@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 12cce839321e - main - www/gitlab-ce: Fix sidekiq-cron problem disable log to console List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12cce839321eee9e5c745a71af56c8bdf556da39 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=12cce839321eee9e5c745a71af56c8bdf556da39 commit 12cce839321eee9e5c745a71af56c8bdf556da39 Author: Matthias Fechner AuthorDate: 2021-10-28 14:43:31 +0000 Commit: Matthias Fechner CommitDate: 2021-10-29 06:33:39 +0000 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 --- www/gitlab-ce/Makefile | 2 +- www/gitlab-ce/files/patch-bin_background__jobs | 11 +++++++++++ .../patch-lib_gitlab_sidekiq__logging_json__formatter.rb | 10 ++++++++++ .../patch-lib_gitlab_sidekiq__logging_structured__logger.rb | 5 +++-- .../files/patch-lib_gitlab_sidekiq__middleware_monitor.rb | 10 ++++++++++ 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