applicaster-logger 0.4.0 → 0.5.1

data/lib/applicaster-logger.rb

@@ -1,2 +1,3 @@
 require 'applicaster/logger'
 require "applicaster/rack/request_uuid"
+require "applicaster/sidekiq/middleware"

data/lib/applicaster/logger.rb

@@ -33,11 +33,21 @@ module Applicaster
         Delayed::Worker.logger.formatter =
           Applicaster::Logger::Formatter.new(facility: "delayed_job")
       end
-      if defined?(Sidekiq)
-        Sidekiq::Logging.logger = LogStashLogger.new(logstash_config)
-        Sidekiq::Logging.logger.level = app.config.applicaster_logger.level
-        Sidekiq::Logging.logger.formatter =
-          Applicaster::Logger::Formatter.new(facility: "sidekiq")
+
+      if defined?(Sidekiq) && Sidekiq.respond_to?(:configure_server)
+        Sidekiq.configure_server do |config|
+          config.server_middleware do |chain|
+            chain.remove Sidekiq::Middleware::Server::Logging
+            chain.add Sidekiq::Middleware::Server::LogstashLogging
+          end
+        end
+      end
+
+      if defined?(Sidetiq)
+        Sidetiq.logger = LogStashLogger.new(logstash_config)
+        Sidetiq.logger.level = app.config.applicaster_logger.level
+        Sidetiq.logger.formatter =
+          Applicaster::Logger::Formatter.new(facility: "sidetiq")
       end
     end
 

data/lib/applicaster/logger/version.rb

@@ -1,5 +1,5 @@
 module Applicaster
   module Logger
-    VERSION = "0.4.0"
+    VERSION = "0.5.1"
   end
 end

data/lib/applicaster/sidekiq/middleware.rb

@@ -0,0 +1,106 @@
+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,
+                params: item['args'],
+                latency: Sidekiq::Job.new(Sidekiq.dump_json(item)).latency,
+                memory: memory
+              }))
+
+              start = Time.now
+
+              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,
+                params: 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,
+                params: item['args'],
+                runtime: elapsed(start),
+                exception_class: e.class.to_s,
+                exception_message: e.message,
+                backtrace: e.backtrace.join("\n"),
+                memory: memory
+              }))
+
+              raise e
+            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
+
+        private
+
+        def pid
+          ::Process.pid
+        end
+
+        def tid
+          ::Thread.current.object_id.to_s(36)
+        end
+
+        def context
+          ::Thread.current[:sidekiq_context]
+        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 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
+
+          data
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: applicaster-logger
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-logger
@@ -94,6 +94,7 @@ files:
 - lib/applicaster/logger/railtie.rb
 - lib/applicaster/logger/version.rb
 - lib/applicaster/rack/request_uuid.rb
+- lib/applicaster/sidekiq/middleware.rb
 homepage: ''
 licenses:
 - MIT
@@ -107,12 +108,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4213316175037752544
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4213316175037752544
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23