Merge branch 'master' into 'master'
Sidekiq::MemoryKiller: Add missing space in log message See merge request gitlab-org/gitlab-ce!14553
This commit is contained in:
commit
01852ee882
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: "Add missing space in Sidekiq memory killer log message"
|
||||||
|
merge_request: 14553
|
||||||
|
author: Benjamin Drung
|
||||||
|
type: fixed
|
|
@ -25,7 +25,7 @@ module Gitlab
|
||||||
|
|
||||||
Sidekiq.logger.warn "current RSS #{current_rss} exceeds maximum RSS "\
|
Sidekiq.logger.warn "current RSS #{current_rss} exceeds maximum RSS "\
|
||||||
"#{MAX_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"
|
"in #{GRACE_TIME} seconds"
|
||||||
sleep(GRACE_TIME)
|
sleep(GRACE_TIME)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue