logjam_agent 0.6.4 → 0.6.5

data/lib/logjam_agent.rb

@@ -87,16 +87,26 @@ module LogjamAgent
     EOS
   end
 
+  # setup json encoding
+  begin
+    require "oj"
+    def self.encode_payload(data)
+      Oj.dump(data, :mode => :compat)
+    end
+  rescue LoadError
+    def self.encode_payload(data)
+      data.to_json
+    end
+  end
+
   def self.event(label, extra_fields = {})
-    logjam_fields = {
+    fields = {
       :label      => label,
       :started_at => Time.now.iso8601,
       :host       => hostname
     }
-    logjam_fields.merge!(extra_fields)
-
-    json_message = Oj.dump(logjam_fields, :format => :compat)
-    forwarder.forward(json_message, :routing_key => events_routing_key)
+    fields.merge!(extra_fields)
+    forwarder.forward(encode_payload(fields), :routing_key => events_routing_key)
   end
 
   private

data/lib/logjam_agent/request.rb

@@ -41,25 +41,13 @@ module LogjamAgent
 
     def forward
       engine = @fields.delete(:engine)
-      @forwarder.forward(encode_payload, :engine => engine)
+      @forwarder.forward(LogjamAgent.encode_payload(@fields), :engine => engine)
     rescue Exception => e
       handle_forwarding_error(e)
     end
 
     private
 
-    if defined?(Oj)
-      def encode_payload
-        Oj.dump(@fields, :mode => :compat)
-      rescue
-        @fields.to_json
-      end
-    else
-      def encode_payload
-        @fields.to_json
-      end
-    end
-
     def format_time(t)
       # iso time with microseconds
       t.strftime("%Y-%m-%dT%H:%M:%S.#{"%06d" % t.usec}")

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logjam_agent
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-20 00:00:00 Z
+date: 2013-04-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake