sidekiq-logging-json 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dc0dc0aab1285f7082c2f61aa4ba999c2877078
-  data.tar.gz: a89d8f5deba592f594c5d91458123e7231fd275b
+  metadata.gz: 3ff0f8dd857e176ed01156393972c0d0937f89d1
+  data.tar.gz: 5ce9b30ae414561a2b0b6e72d81be2065c27aae5
 SHA512:
-  metadata.gz: 911414f9c0900b0643115095eb1d30395396f6f2504236f5d4ad740ab2906cbb72985e270adf1755aa17a4c83d5c6a26b0fdda498f2fea11f2bb80486758acc1
-  data.tar.gz: 89bfa7ff96c6536f774a3a9d616199e70078f1f689e7e5bf38946c2b74c9744c95f437f72b44ecc3d3624ea74490333656c4187dea101d09123f669aed04c8be
+  metadata.gz: ba590683e12f4fad5dc89c1b446626c7b32cc42b55e700e408758569247788221be36f6c4812cb51f8f8161655a7e1b768d480ebd8e35d53f15b4082d09a65f7
+  data.tar.gz: a048483e78df758c1639a290ddafb7c062b16e5eb5c131cfcd7d6532db00bc3e22245591eb208063e7d80022b5743790e92cbc525a4709681072fdac8f6a99c0

data/Rakefile

@@ -1,2 +1,6 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
 
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/sidekiq/logging/json.rb

@@ -21,34 +21,35 @@ module Sidekiq
             '@status' => nil,
             '@severity' => severity,
             '@run_time' => nil,
-            '@message' => "#{time.utc.iso8601} #{::Process.pid} TID-#{Thread.current.object_id.to_s(36)}#{context} #{severity}: #{message}",
-          }.merge(process_message(severity, time, program_name, message)).to_json + "\n"
+          }.merge(process_message(message)).to_json + "\n"
         end
 
-        def process_message(severity, time, program_name, message)
-          return { '@status' => 'exception' } if message.is_a?(Exception)
-
-          if message.is_a? Hash
+        def process_message(message)
+          case message
+          when Exception
+            { '@status' => 'exception', '@message' => message.message }
+          when Hash
             if message["retry"]
-              status = "retry"
-              msg = "#{message['class']} failed, retrying with args #{message['args']}."
+              {
+                '@status' => 'retry',
+                '@message' => "#{message['class']} failed, retrying with args #{message['args']}."
+              }
             else
-              status = "dead"
-              msg = "#{message['class']} failed with args #{message['args']}, not retrying."
+              {
+                '@status' => 'dead',
+                '@message' => "#{message['class']} failed with args #{message['args']}, not retrying."
+              }
             end
-            return {
-              '@status' => status,
-              '@message' => "#{time.utc.iso8601} #{::Process.pid} TID-#{Thread.current.object_id.to_s(36)}#{context} #{severity}: #{msg}"
+          else
+            result = message.split(" ")
+            status = result[0].match(/^(start|done|fail):?$/) || []
+
+            {
+              '@status' => status[1],                                   # start or done
+              '@run_time' => status[1] && result[1] && result[1].to_f,  # run time in seconds
+              '@message' => message
             }
           end
-
-          result = message.split(" ")
-          status = result[0].match(/^(start|done|fail):?$/) || []
-
-          {
-            '@status' => status[1],                                   # start or done
-            '@run_time' => status[1] && result[1] && result[1].to_f   # run time in seconds
-          }
         end
       end
     end

data/lib/sidekiq/logging/json/version.rb

@@ -1,7 +1,7 @@
 module Sidekiq
   module Logging
     module Json
-      VERSION = "0.0.15"
+      VERSION = "0.0.16"
     end
   end
 end

data/sidekiq-logging-json.gemspec

@@ -27,5 +27,5 @@ DESC
   spec.add_development_dependency "rake", "~> 10"
   spec.add_development_dependency "rspec", "~> 3"
 
-  spec.add_runtime_dependency "sidekiq", ">= 3"
+  spec.add_runtime_dependency "sidekiq", [">= 3", "< 5"]
 end

data/spec/sidekiq/logging/json_spec.rb

@@ -11,33 +11,33 @@ describe "Sidekiq::Logging::Json" do
     let(:time) { Time.now }
     let(:program_name) { "RSpec" }
 
-    it { expect( message ).to match(/#{logentry}/) }
-    it { expect( status ).to eq(nil) }
-    it { expect( run_time ).to eq(nil) }
+    it { expect(message).to match(/#{logentry}/) }
+    it { expect(status).to eq(nil) }
+    it { expect(run_time).to eq(nil) }
 
     context "start" do
       let(:logentry) { "start" }
 
-      it { expect( message ).to match(/#{logentry}/) }
-      it { expect( status ).to eq("start") }
-      it { expect( run_time ).to eq(nil) }
+      it { expect(message).to match(/#{logentry}/) }
+      it { expect(status).to eq("start") }
+      it { expect(run_time).to eq(nil) }
     end
 
     context "done" do
       let(:logentry) { "done: 51.579 sec" }
 
-      it { expect( message ).to match(/#{logentry}/) }
-      it { expect( status ).to eq("done") }
-      it { expect( run_time ).to eq(51.579) }
+      it { expect(message).to match(/#{logentry}/) }
+      it { expect(status).to eq("done") }
+      it { expect(run_time).to eq(51.579) }
     end
 
     context "exception" do
       let(:exception_message) { "This is the message that should be logged." }
-      let(:logentry) { NoMethodError.new( exception_message ) }
+      let(:logentry) { NoMethodError.new(exception_message) }
 
-      it { expect(message).to match( exception_message ) }
-      it { expect( status ).to eq("exception") }
-      it { expect( run_time ).to eq(nil) }
+      it { expect(message).to match(exception_message) }
+      it { expect(status).to eq("exception") }
+      it { expect(run_time).to eq(nil) }
     end
 
     context "retry" do
@@ -45,9 +45,19 @@ describe "Sidekiq::Logging::Json" do
         {"retry"=>true, "queue"=>"default", "class"=>"MarkTest", "args"=>["markie"], "jid"=>"0ca71f2580fdc0ae19a59063", "enqueued_at"=>1405957471.1871092}
       end
 
-      it { expect(message).to match( "MarkTest failed, retrying." ) }
-      it { expect( status ).to eq("retry") }
-      it { expect( run_time ).to eq(nil) }
+      it { expect(message).to match("MarkTest failed, retrying.") }
+      it { expect(status).to eq("retry") }
+      it { expect(run_time).to eq(nil) }
+    end
+
+    context "dead" do
+      let(:logentry) do
+        {"retry"=>false, "queue"=>"default", "class"=>"MarkTest", "args"=>["markie"], "jid"=>"0ca71f2580fdc0ae19a59063", "enqueued_at"=>1405957471.1871092}
+      end
+
+      it { expect(message).to match("MarkTest failed with args #{logentry["args"]}, not retrying.") }
+      it { expect(status).to eq("dead") }
+      it { expect(run_time).to eq(nil) }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-logging-json
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Wouter de Vos
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -67,6 +70,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 description: |
   At Springest, we use Logstash to ship all our logs to Elasticsearch. An Elasticsearch index consists of JSON documents.
   To make it possible to make fine grained queries on Sidekiq logs, we needed logging in JSON format.