heavylog 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bebc8d293109a91a0667703a5b242d93d68c9a2bce37ea7a641b163b1058257f
-  data.tar.gz: be5e75a379ab306cd05c679f9bd69435e28fa06ed1907199bbd879d472cfccc2
+  metadata.gz: 4aa084da3eb852633de1b48ab303da16e6f5177cf56995b135f483b92484159e
+  data.tar.gz: 86fc4f5d4892b4c18719c74a7f7d626ea536360811a5ce2a15bcd761eae91a33
 SHA512:
-  metadata.gz: 0a4dc4c47f334abde1326b0c643ca3059d33a58c4b05f211597c1ef45e656ba81e6e59e9d858613fa9f2d03a8c1062c1fb48f44e47ba5ae830e8db3e3e95f5f4
-  data.tar.gz: 9f78e3841a815d772cdae8789e95bd150aada4ba3137b8ac9be238ca1e918a65e712dc226ece4e6514804a3abd64eff6f3c6fb44a8a1396a5712c0d18597984c
+  metadata.gz: b904c1a842315c5a2aefea6e553c07b26b9055d3e5a72cc7a7cd0b0b4c129e6423161ff554284cdaa4a03d25f93247d7dc83587c719bdfcb4c62e51a4a10330b
+  data.tar.gz: bf51e06cb88c89fd027c86152441e137742729210130d127320fd7c5a56a92785876645fd99777816d242f12355fdf530b2f0d5ae537204381b304ca93465c0c

data/lib/heavylog/railtie.rb

@@ -5,6 +5,7 @@ module Heavylog
     config.heavylog.enabled = false
     config.heavylog.path = 'log/heavylog.log'
     config.heavylog.message_limit = 1024 * 1024 * 50 # 50MB
+    config.heavylog.log_sidekiq = false
 
     initializer "heavylog.insert_middleware" do |app|
       app.config.middleware.insert_before Rails::Rack::Logger, Heavylog::Middleware

data/lib/heavylog/sidekiq_exception_handler.rb

@@ -0,0 +1,10 @@
+module Heavylog
+  class SidekiqExceptionHandler
+    def call(ex, ctxHash)
+      Heavylog.log(:warn, Sidekiq.dump_json(ctxHash)) if !ctxHash.empty?
+      Heavylog.log(:warn, "#{ex.class.name}: #{ex.message}")
+      Heavylog.log(:warn, ex.backtrace.join("\n")) unless ex.backtrace.nil?
+      Heavylog.finish_sidekiq
+    end
+  end
+end

data/lib/heavylog/sidekiq_logger.rb

@@ -0,0 +1,30 @@
+module Heavylog
+  class SidekiqLogger
+    def call(item, queue)
+      # item = {"class"=>"SuspiciousJob", "args"=>[12754545, [3858890], "invoice"], "retry"=>true, "queue"=>"default", "jid"=>"5ec968571e358497d70a3cf2", "created_at"=>1540484817.3950138, "enqueued_at"=>1540484817.395076}
+
+      Heavylog.log_sidekiq(item["jid"], item["class"], item["args"])
+
+      begin
+        start = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+        logger.info("start")
+        yield
+        logger.info("done: #{elapsed(start)} sec")
+        Heavylog.finish_sidekiq
+      rescue Exception
+        logger.info("fail: #{elapsed(start)} sec")
+        raise
+      end
+    end
+
+    private
+
+    def elapsed(start)
+      (::Process.clock_gettime(::Process::CLOCK_MONOTONIC) - start).round(3)
+    end
+
+    def logger
+      Sidekiq.logger
+    end
+  end
+end

data/lib/heavylog/version.rb

@@ -1,3 +1,3 @@
 module Heavylog
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/heavylog.rb

@@ -6,6 +6,8 @@ require 'heavylog/log_subscriber'
 require 'heavylog/middleware'
 require 'heavylog/ordered_options'
 require 'heavylog/request_logger'
+require 'heavylog/sidekiq_logger'
+require 'heavylog/sidekiq_exception_handler'
 
 module Heavylog
   module_function
@@ -18,6 +20,7 @@ module Heavylog
     self.application = app
     patch_loggers
     attach_to_action_controller
+    attach_to_sidekiq
     setup_custom_payload
     set_options
   end
@@ -40,6 +43,16 @@ module Heavylog
     Heavylog::LogSubscriber.attach_to :action_controller
   end
 
+  def attach_to_sidekiq
+    return if !config.log_sidekiq
+
+    Sidekiq.configure_server do |config|
+      config.options[:job_logger] = SidekiqLogger
+    end
+
+    Sidekiq.error_handlers << SidekiqExceptionHandler.new
+  end
+
   def setup_custom_payload
     return unless config.custom_payload_method.respond_to?(:call)
 
@@ -85,6 +98,22 @@ module Heavylog
     end
   end
 
+  def log_sidekiq(jid, klass, args)
+    return if !config.enabled
+
+    RequestStore.store[:heavylog_request_id] = jid
+    RequestStore.store[:heavylog_request_start] = Time.now.iso8601
+    RequestStore.store[:heavylog_request_ip] = "127.0.0.1"
+
+    RequestStore.store[:heavylog_request_data] = {
+      controller: "SidekiqLogger",
+      action: klass,
+      args: args.to_s,
+    }
+
+    RequestStore.store[:heavylog_buffer] ||= StringIO.new
+  end
+
   def finish
     return if !config.enabled
 
@@ -102,6 +131,11 @@ module Heavylog
     Heavylog.logger.send(Heavylog.log_level, formatted)
   end
 
+  def finish_sidekiq
+    finish
+    RequestStore.store[:heavylog_buffer] = nil
+  end
+
   def config
     return OrderedOptions.new if !application
     application.config.heavylog

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heavylog
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Kristjan Rang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,6 +134,8 @@ files:
 - lib/heavylog/ordered_options.rb
 - lib/heavylog/railtie.rb
 - lib/heavylog/request_logger.rb
+- lib/heavylog/sidekiq_exception_handler.rb
+- lib/heavylog/sidekiq_logger.rb
 - lib/heavylog/version.rb
 homepage: https://github.com/krisrang/heavylog
 licenses: