From d350b3a7931eabfd42b8968c13bd32dde42bbfb5 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Fri, 23 Feb 2018 17:35:07 +0100 Subject: Only instantiate Queue in test --- lib/gitlab/sidekiq_middleware/shutdown.rb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/gitlab/sidekiq_middleware/shutdown.rb b/lib/gitlab/sidekiq_middleware/shutdown.rb index 0daf7772781..c2b8d6de66e 100644 --- a/lib/gitlab/sidekiq_middleware/shutdown.rb +++ b/lib/gitlab/sidekiq_middleware/shutdown.rb @@ -42,7 +42,7 @@ module Gitlab end def initialize - @trace = Queue.new + @trace = Queue.new if Rails.env.test? end def call(worker, job, queue) @@ -114,19 +114,19 @@ module Gitlab end def sleep(time) - @trace << [:sleep, time] - - return if Rails.env.test? - - Kernel.sleep(time) + if Rails.env.test? + @trace << [:sleep, time] + else + Kernel.sleep(time) + end end def kill(signal, pid) - @trace << [:kill, signal, pid] - - return if Rails.env.test? - - Process.kill(signal, pid) + if Rails.env.test? + @trace << [:kill, signal, pid] + else + Process.kill(signal, pid) + end end end end -- cgit v1.2.1