sidekiq-logging-json 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05dedabda3a19624d090e99d8abad07f7b61b294
-  data.tar.gz: ee5e8a5bf244910c49fb42cc89918f221e61f860
+  metadata.gz: 0f4079eaf3238dd1dd917cf12319e6a1e5b7509d
+  data.tar.gz: 3e3c14122d40f6ca293c8b9e83ce2c91d344ef15
 SHA512:
-  metadata.gz: ea42d627687aa06ba28333569f664fac8924635bf5cb765e05c356278d3f33a8040cec2d57b51d3c5acca0f4bdc301f8a9365a703c19a43b46f787356ed3e291
-  data.tar.gz: e12b62184ee79b67a2796127a88d1eb1201fa65f9419463c451f021cee95c1a07880995c2fecbd1a85c1dfce73743c5f2fcc9b9d56986fae2490b0cfe2ddde72
+  metadata.gz: 3ac21724b975e195b5946c5814a1e72f37928a7053197702f252e1adcf422237671808a0fdbb6d6de699ce8307b79cb2af070fdd7a335c7cc71f2bc28a947be0
+  data.tar.gz: 467b3e0525d4ac0193c24837af29e76cce3d99a82d2cb497a9de0a0ac4e79c07091a95c8cda59a2e29854567ee6b27931c8de5e3ea5256e18ddbb6aa1714c925

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

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

data/lib/sidekiq/logging/json.rb

@@ -22,14 +22,18 @@ 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, severity)).to_json + "\n"
+          }.merge(process_message(message)).to_json + "\n"
         end
 
-        def process_message(message, severity)
+        def process_message(message)
+          return { '@status' => 'exception' } if message.is_a?(Exception)
+
           result = message.split(" ")
+          status = result[0].match(/^(start|done):?$/) || []
+
           {
-            '@status' => result[0],                      # start or done
-            '@run_time' => result[1] && result[1].to_f   # run time in seconds
+            '@status' => status[1],                      # start or done
+            '@run_time' => status[1] && result[1] && result[1].to_f   # run time in seconds
           }
         end
       end

data/spec/sidekiq/logging/json_spec.rb

@@ -2,30 +2,42 @@ require 'spec_helper'
 
 describe "Sidekiq::Logging::Json" do
   describe "process_message" do
-    subject { Sidekiq::Logging::Json::Logger.new.process_message(logentry) }
+    subject { JSON.parse(Sidekiq::Logging::Json::Logger.new.call(severity, time, program_name, logentry)) }
     let(:logentry) { "Some random message" }
-    let(:message) { subject[:message] }
-    let(:status) { subject[:status] }
-    let(:run_time) { subject[:run_time] }
+    let(:message) { subject["@message"] }
+    let(:status) { subject["@status"] }
+    let(:run_time) { subject["@run_time"] }
+    let(:severity) { "INFO" }
+    let(:time) { Time.now }
+    let(:program_name) { "RSpec" }
 
-    it { expect( message ).to eq(logentry) }
+    it { expect( message ).to match(/#{logentry}/) }
     it { expect( status ).to eq(nil) }
     it { expect( run_time ).to eq(nil) }
 
     context "start" do
-      let(:logentry) { "2014-06-05T12:38:55Z 8630 TID-osanfu5nw SubjectClickthroughTracker JID-e17a9e9ca0521bb74b423166 INFO: start" }
+      let(:logentry) { "start" }
 
-      it { expect( message ).to eq(logentry) }
+      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) { "2014-06-05T12:38:42Z 8630 TID-osammcf2k TrainingIndexer::Work JID-177066e96052c2314dcad8c7 INFO: done: 51.579 sec" }
+      let(:logentry) { "done: 51.579 sec" }
 
-      it { expect( message ).to eq(logentry) }
+      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 ) }
+
+      it { expect(message).to match( exception_message ) }
+      it { expect( status ).to eq("exception") }
+      it { expect( run_time ).to eq(nil) }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-logging-json
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Wouter de Vos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler