realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix gitlab-puma service failing to start by requiring sidekiq/job_logger

Browse source
This commit is contained in:
Pirate Praveen 2021-11-19 18:39:11 +05:30
parent 9ec2389e94
commit 2c087856cc
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
debian/patches/series vendored
View file

@ -25,3 +25,4 @@ tweaks/0050-add-salsa-link-to-help.patch
tweaks/0060-fix-relative-paths.patch tweaks/0060-fix-relative-paths.patch
tweaks/0070-remove-capybara-screenshot-rspec.patch tweaks/0070-remove-capybara-screenshot-rspec.patch
tweaks/0080-search-binaries-in-path.patch tweaks/0080-search-binaries-in-path.patch
tweaks/0090-require-sidekiq-job-logger.patch

15
debian/patches/tweaks/0090-require-sidekiq-job-logger.patch vendored Normal file
View file

@ -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