diff options
| author | Benjamin Drung <benjamin.drung@profitbricks.com> | 2017-09-28 14:39:50 +0200 |
|---|---|---|
| committer | Benjamin Drung <benjamin.drung@profitbricks.com> | 2017-10-04 10:50:43 +0200 |
| commit | 74846409ce032f0771a186723e451e3af5ba27c6 (patch) | |
| tree | 0fdcb37dc59fde59df4ba38c5ef80505e7202fc8 | |
| parent | 88959e872e92549a9b3e6255bfe9c70ef2194b24 (diff) | |
| download | gitlab-ce-74846409ce032f0771a186723e451e3af5ba27c6.tar.gz | |
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'.
| -rw-r--r-- | changelogs/unreleased/14553-missing-space-in-log-msg.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/sidekiq_middleware/memory_killer.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/14553-missing-space-in-log-msg.yml b/changelogs/unreleased/14553-missing-space-in-log-msg.yml new file mode 100644 index 00000000000..a0420d49770 --- /dev/null +++ b/changelogs/unreleased/14553-missing-space-in-log-msg.yml @@ -0,0 +1,5 @@ +--- +title: "Add missing space in Sidekiq memory killer log message" +merge_request: 14553 +author: Benjamin Drung +type: fixed 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) |