diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-10-04 16:59:47 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-10-04 16:59:47 +0000 |
| commit | 01852ee882de4636cd04f3a3d03c5fa5bbd6e20a (patch) | |
| tree | d1d918fe464f3c8a7b9df543f9d8e25cec63a627 | |
| parent | 502a3a29bdb559deb87830c5f2e4659b3dd80629 (diff) | |
| parent | 74846409ce032f0771a186723e451e3af5ba27c6 (diff) | |
| download | gitlab-ce-01852ee882de4636cd04f3a3d03c5fa5bbd6e20a.tar.gz | |
Merge branch 'master' into 'master'
Sidekiq::MemoryKiller: Add missing space in log message
See merge request gitlab-org/gitlab-ce!14553
| -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) |