diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-07-22 15:50:50 +0700 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-07-25 17:49:10 +0700 |
| commit | ad7acfaad0e806cac48889451631061775a6dfa2 (patch) | |
| tree | 3bcbffa3310cb9066807984d0c4f68fcc0f6ff5f /spec | |
| parent | 0ec40a68b73cbf14b34e55ee2a54df1f47c19cfb (diff) | |
| download | gitlab-ce-ad7acfaad0e806cac48889451631061775a6dfa2.tar.gz | |
Logging sidekiq worker class name in SidekiqMemoryKillerprint-sidekiq-class-name-in-memory-killer
Currently, SidekiqMemoryKiller does not feed worker class name in the
json structured logging. This commit extends the json parameter.
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb b/spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb index 1a5a38b5d99..b451844f06c 100644 --- a/spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb +++ b/spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb @@ -45,6 +45,9 @@ describe Gitlab::SidekiqMiddleware::MemoryKiller do expect(subject).to receive(:sleep).with(10).ordered expect(Process).to receive(:kill).with('SIGKILL', pid).ordered + expect(Sidekiq.logger) + .to receive(:warn).with(class: 'TestWorker', message: anything, pid: pid, signal: anything).at_least(:once) + run end |