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:
authorBenjamin Drung <benjamin.drung@profitbricks.com>2017-09-28 15:39:50 +0300
committerBenjamin Drung <benjamin.drung@profitbricks.com>2017-10-04 11:50:43 +0300
commit74846409ce032f0771a186723e451e3af5ba27c6 (patch)
tree0fdcb37dc59fde59df4ba38c5ef80505e7202fc8 /lib/gitlab/sidekiq_middleware
parent88959e872e92549a9b3e6255bfe9c70ef2194b24 (diff)
Sidekiq::MemoryKiller: Add missing space in log message
The sidekiq memory killer prints warnings like gitlab-sidekiq[8245]: 2017-09-27T11:31:43.192Z 8245 TID-ov9l6b4e0 WARN: this thread will shut down PID 8245 - Worker ProjectWebHookWorker - JID-dd3b1c23a653deec5e575ab4in 900 seconds There is a space missing between the JID and 'in'.
Diffstat (limited to 'lib/gitlab/sidekiq_middleware')
-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 104280f520a..d7d24eeb37b 100644
--- a/lib/gitlab/sidekiq_middleware/memory_killer.rb
+++ b/lib/gitlab/sidekiq_middleware/memory_killer.rb
@@ -25,7 +25,7 @@ module Gitlab
Sidekiq.logger.warn "current RSS #{current_rss} exceeds maximum RSS "\
"#{MAX_RSS}"
- Sidekiq.logger.warn "this thread will shut down PID #{Process.pid} - Worker #{worker.class} - JID-#{job['jid']}"\
+ Sidekiq.logger.warn "this thread will shut down PID #{Process.pid} - Worker #{worker.class} - JID-#{job['jid']} "\
"in #{GRACE_TIME} seconds"
sleep(GRACE_TIME)