sidekiq-logging-json 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f4079eaf3238dd1dd917cf12319e6a1e5b7509d
-  data.tar.gz: 3e3c14122d40f6ca293c8b9e83ce2c91d344ef15
+  metadata.gz: 22f1dc3bbef68d155baf1ce1103b5558b0d03e75
+  data.tar.gz: 7cba8152b668f6dd4cefde07c52c4259aed9b29a
 SHA512:
-  metadata.gz: 3ac21724b975e195b5946c5814a1e72f37928a7053197702f252e1adcf422237671808a0fdbb6d6de699ce8307b79cb2af070fdd7a335c7cc71f2bc28a947be0
-  data.tar.gz: 467b3e0525d4ac0193c24837af29e76cce3d99a82d2cb497a9de0a0ac4e79c07091a95c8cda59a2e29854567ee6b27931c8de5e3ea5256e18ddbb6aa1714c925
+  metadata.gz: 5624056763ee19f189f9077ed77a8af403d863d8f20752be0d82ae7e0fdc9b3a8a906a8a5393860dfcf40b58d8f6d0a2b9c18163a1d71fc2d4d338126e5d4a3b
+  data.tar.gz: a9aaefd2fbacc567b896094d1378d9874b9b6e81d2e42fb3d72dd7fa03225ebe214416e7ccb07ea925ca55f29d31520d27a96e055a7b65e9d4ede002934b73b9

data/lib/sidekiq/logging/json.rb

@@ -22,12 +22,26 @@ module Sidekiq
             '@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(message)).to_json + "\n"
+          }.merge(process_message(severity, time, program_name, message)).to_json + "\n"
         end
 
-        def process_message(message)
+        def process_message(severity, time, program_name, message)
           return { '@status' => 'exception' } if message.is_a?(Exception)
 
+          if message.is_a? Hash
+            if message["retry"]
+              status = "retry"
+              msg = "MarkTest failed, retrying."
+            else
+              status "dead"
+              msg = "MarkTest faild, not retrying."
+            end
+            return {
+              '@status' => status,
+              '@message' => "#{time.utc.iso8601} #{::Process.pid} TID-#{Thread.current.object_id.to_s(36)}#{context} #{severity}: #{msg}"
+            }
+          end
+
           result = message.split(" ")
           status = result[0].match(/^(start|done):?$/) || []
 

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

@@ -1,7 +1,7 @@
 module Sidekiq
   module Logging
     module Json
-      VERSION = "0.0.10"
+      VERSION = "0.0.11"
     end
   end
 end

data/spec/sidekiq/logging/json_spec.rb

@@ -39,5 +39,15 @@ describe "Sidekiq::Logging::Json" do
       it { expect( status ).to eq("exception") }
       it { expect( run_time ).to eq(nil) }
     end
+
+    context "retry" do
+      let(:logentry) 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) }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-logging-json
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Wouter de Vos