From 2c087856cc679f80404b70d1587b923ec0fc5a92 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Fri, 19 Nov 2021 18:39:11 +0530 Subject: [PATCH] Fix gitlab-puma service failing to start by requiring sidekiq/job_logger --- debian/patches/series | 1 + .../tweaks/0090-require-sidekiq-job-logger.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 debian/patches/tweaks/0090-require-sidekiq-job-logger.patch diff --git a/debian/patches/series b/debian/patches/series index 533777f86f..533c362237 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -25,3 +25,4 @@ tweaks/0050-add-salsa-link-to-help.patch tweaks/0060-fix-relative-paths.patch tweaks/0070-remove-capybara-screenshot-rspec.patch tweaks/0080-search-binaries-in-path.patch +tweaks/0090-require-sidekiq-job-logger.patch diff --git a/debian/patches/tweaks/0090-require-sidekiq-job-logger.patch b/debian/patches/tweaks/0090-require-sidekiq-job-logger.patch new file mode 100644 index 0000000000..ae4fc0c9f1 --- /dev/null +++ b/debian/patches/tweaks/0090-require-sidekiq-job-logger.patch @@ -0,0 +1,15 @@ +Fixes Unable to load application: NameError: uninitialized constant Sidekiq::JobLogger"} +when starting gitlab-puma service + +Possibly because we have sidekiq 6.3.1 and upstream uses 6.2.2 + +--- a/lib/gitlab/sidekiq_logging/structured_logger.rb ++++ b/lib/gitlab/sidekiq_logging/structured_logger.rb +@@ -2,6 +2,7 @@ + + require 'active_record' + require 'active_record/log_subscriber' ++require 'sidekiq/job_logger' + + module Gitlab + module SidekiqLogging