From 8dd53611ddfdd40bca983036a62f4591db99d3d7 Mon Sep 17 00:00:00 2001 From: Michael Grosser Date: Wed, 12 Aug 2015 10:39:31 -0700 Subject: [PATCH] small refactor for Logging middleware --- lib/sidekiq/middleware/server/logging.rb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/sidekiq/middleware/server/logging.rb b/lib/sidekiq/middleware/server/logging.rb index 41e4c63dd..78f98be32 100644 --- a/lib/sidekiq/middleware/server/logging.rb +++ b/lib/sidekiq/middleware/server/logging.rb @@ -4,11 +4,7 @@ module Server class Logging def call(worker, item, queue) - # If we're using a wrapper class, like ActiveJob, use the "wrapped" - # attribute to expose the underlying thing. - klass = item['wrapped'] || worker.class.to_s - - Sidekiq::Logging.with_context("#{klass} JID-#{item['jid']}#{" BID-#{item['bid']}" if item['bid']}") do + Sidekiq::Logging.with_context(log_context(worker, item)) do begin start = Time.now logger.info { "start" } @@ -21,6 +17,15 @@ def call(worker, item, queue) end end + private + + # If we're using a wrapper class, like ActiveJob, use the "wrapped" + # attribute to expose the underlying thing. + def log_context(worker, item) + klass = item['wrapped'.freeze] || worker.class.to_s + "#{klass} JID-#{item['jid'.freeze]}#{" BID-#{item['bid'.freeze]}" if item['bid'.freeze]}" + end + def elapsed(start) (Time.now - start).round(3) end