Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-07-31 16:04:46 +0300
committerStan Hu <stanhu@gmail.com>2019-07-31 16:04:46 +0300
commit7bab7b6993edbaf0d1fa2dfce315563dad676a44 (patch)
treed74854572a06dd0c16c052683cfa0d59ac2e5baa /lib/gitlab
parentf10295b2956665d351eb413d380673090cb13b24 (diff)
parent8f14d3c1401088a61a2360b9ad988807f944bd79 (diff)
Merge branch 'fix-sidekiq-memory-killer-warn-message' into 'master'
Fix sidekiq memory killer warning message Closes gitlab-com/gl-infra/infrastructure#7371 See merge request gitlab-org/gitlab-ce!31264
Diffstat (limited to 'lib/gitlab')
-rw-r--r--lib/gitlab/sidekiq_middleware/memory_killer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/sidekiq_middleware/memory_killer.rb b/lib/gitlab/sidekiq_middleware/memory_killer.rb
index 4b10f921ed8..49c4fdc3033 100644
--- a/lib/gitlab/sidekiq_middleware/memory_killer.rb
+++ b/lib/gitlab/sidekiq_middleware/memory_killer.rb
@@ -84,7 +84,7 @@ module Gitlab
end
def warn(message, signal: nil)
- Sidekiq.logger.warn(class: worker.class, pid: pid, signal: signal, message: message)
+ Sidekiq.logger.warn(class: worker.class.name, pid: pid, signal: signal, message: message)
end
end
end