Commit f96750dd authored by Sean McGivern's avatar Sean McGivern

Merge branch 'sh-defer-json-load-sidekiq-cluster' into 'master'

Defer loading of Sidekiq JSON formatter

See merge request gitlab-org/gitlab!26556
parents 3ea8f2f2 453fc3e6
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
require 'optparse' require 'optparse'
require 'logger' require 'logger'
require 'time' require 'time'
require_relative '../../../../lib/gitlab/sidekiq_logging/json_formatter'
module Gitlab module Gitlab
module SidekiqCluster module SidekiqCluster
...@@ -16,6 +15,8 @@ module Gitlab ...@@ -16,6 +15,8 @@ module Gitlab
CommandError = Class.new(StandardError) CommandError = Class.new(StandardError)
def initialize(log_output = STDERR) def initialize(log_output = STDERR)
require_relative '../../../../lib/gitlab/sidekiq_logging/json_formatter'
# As recommended by https://github.com/mperham/sidekiq/wiki/Advanced-Options#concurrency # As recommended by https://github.com/mperham/sidekiq/wiki/Advanced-Options#concurrency
@max_concurrency = 50 @max_concurrency = 50
@min_concurrency = 0 @min_concurrency = 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment