applicaster-logger 0.5.2 → 0.5.3

data/lib/applicaster/logger.rb

@@ -34,11 +34,11 @@ module Applicaster
           Applicaster::Logger::Formatter.new(facility: "delayed_job")
       end
 
-      if defined?(Sidekiq) && Sidekiq.respond_to?(:configure_server)
+      if defined?(Sidekiq)
         Sidekiq.configure_server do |config|
           config.server_middleware do |chain|
             chain.remove Sidekiq::Middleware::Server::Logging
-            chain.add Sidekiq::Middleware::Server::LogstashLogging
+            chain.add Applicaster::Sidekiq::Middleware::Server::LogstashLogging
           end
         end
       end

data/lib/applicaster/logger/version.rb

@@ -1,5 +1,5 @@
 module Applicaster
   module Logger
-    VERSION = "0.5.2"
+    VERSION = "0.5.3"
   end
 end

data/lib/applicaster/sidekiq/middleware.rb

@@ -1,104 +1,106 @@
-module Sidekiq
-  module Middleware
-    module Server
-      class LogstashLogging
+module Applicaster
+  module Sidekiq
+    module Middleware
+      module Server
+        class LogstashLogging
 
-        def call(worker, item, queue)
-          Sidekiq::Logging.with_context("#{worker.class.to_s} JID-#{item['jid']}") do
-            begin
-              logger.info(filter_fields({
-                message: "Start: #{worker.class.to_s} JID-#{item['jid']}",
-                jid: item['jid'],
-                pid: pid,
-                tid: tid,
-                context: context,
-                worker: worker.class.to_s,
-                queue: queue,
-                args: item['args'],
-                latency: Sidekiq::Job.new(Sidekiq.dump_json(item)).latency,
-                memory: memory
-              }))
+          def call(worker, item, queue)
+            Sidekiq::Logging.with_context("#{worker.class.to_s} JID-#{item['jid']}") do
+              begin
+                logger.info(filter_fields({
+                  message: "Start: #{worker.class.to_s} JID-#{item['jid']}",
+                  jid: item['jid'],
+                  pid: pid,
+                  tid: tid,
+                  context: context,
+                  worker: worker.class.to_s,
+                  queue: queue,
+                  args: item['args'],
+                  latency: Sidekiq::Job.new(Sidekiq.dump_json(item)).latency,
+                  memory: memory
+                }))
 
-              start = Time.now
+                start = Time.now
 
-              yield # Pass the torch
+                yield # Pass the torch
 
-              logger.info(filter_fields({
-                message: "Done: #{worker.class.to_s} JID-#{item['jid']}",
-                jid: item['jid'],
-                pid: pid,
-                tid: tid,
-                context: context,
-                worker: worker.class.to_s,
-                queue: queue,
-                args: item['args'],
-                runtime: elapsed(start),
-                memory: memory
-              }))
-            rescue Exception => e
-              logger.error(filter_fields({
-                message: "Fail: #{worker.class.to_s} JID-#{item['jid']}",
-                jid: item['jid'],
-                pid: pid,
-                tid: tid,
-                context: context,
-                worker: worker.class.to_s,
-                queue: queue,
-                args: item['args'],
-                runtime: elapsed(start),
-                exception_class: e.class.to_s,
-                exception_message: e.message,
-                backtrace: e.backtrace.join("\n"),
-                memory: memory
-              }))
+                logger.info(filter_fields({
+                  message: "Done: #{worker.class.to_s} JID-#{item['jid']}",
+                  jid: item['jid'],
+                  pid: pid,
+                  tid: tid,
+                  context: context,
+                  worker: worker.class.to_s,
+                  queue: queue,
+                  args: item['args'],
+                  runtime: elapsed(start),
+                  memory: memory
+                }))
+              rescue Exception => e
+                logger.error(filter_fields({
+                  message: "Fail: #{worker.class.to_s} JID-#{item['jid']}",
+                  jid: item['jid'],
+                  pid: pid,
+                  tid: tid,
+                  context: context,
+                  worker: worker.class.to_s,
+                  queue: queue,
+                  args: item['args'],
+                  runtime: elapsed(start),
+                  exception_class: e.class.to_s,
+                  exception_message: e.message,
+                  backtrace: e.backtrace.join("\n"),
+                  memory: memory
+                }))
 
-              raise e
+                raise e
+              end
             end
           end
-        end
 
-        def logger
-          @logger ||=
-            begin
-              applicaster_logger = ::Rails.application.config.applicaster_logger
-              logger = LogStashLogger.new(applicaster_logger.logstash_config)
-              logger.level = applicaster_logger.level
-              logger.formatter = Applicaster::Logger::Formatter.new(facility: "sidekiq")
-              logger
-            end
-        end
+          def logger
+            @logger ||=
+              begin
+                applicaster_logger = ::Rails.application.config.applicaster_logger
+                logger = LogStashLogger.new(applicaster_logger.logstash_config)
+                logger.level = applicaster_logger.level
+                logger.formatter = Applicaster::Logger::Formatter.new(facility: "sidekiq")
+                logger
+              end
+          end
 
-        private
+          private
 
-        def pid
-          ::Process.pid
-        end
+          def pid
+            ::Process.pid
+          end
 
-        def tid
-          ::Thread.current.object_id.to_s(36)
-        end
+          def tid
+            ::Thread.current.object_id.to_s(36)
+          end
 
-        def context
-          ::Thread.current[:sidekiq_context]
-        end
+          def context
+            ::Thread.current[:sidekiq_context]
+          end
 
-        def memory
-          `ps -o rss= -p #{::Process.pid}`.chomp.to_i
-        end
+          def memory
+            `ps -o rss= -p #{::Process.pid}`.chomp.to_i
+          end
 
-        def elapsed(start)
-          return nil if start.nil?
-          (Time.now - start).to_f.round(3)
-        end
+          def elapsed(start)
+            return nil if start.nil?
+            (Time.now - start).to_f.round(3)
+          end
 
-        def filter_fields(data)
-          data.each do |key, val|
-            if val.is_a?(String) && val.length > 32766 # max message length
-              data[key] = "[omitted; length = #{val.length}, max = 32766]"
+          def filter_fields(data)
+            data.each do |key, val|
+              if val.is_a?(String) && val.length > 32766 # max message length
+                data[key] = "[omitted; length = #{val.length}, max = 32766]"
+              end
             end
-          end
 
-          data
+            data
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: applicaster-logger
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-logger
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2083619566832428266
+      hash: -2584598253034463662
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2083619566832428266
+      hash: -2584598253034463662
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23