logjam_agent 0.6.3 → 0.6.4

data/lib/logjam_agent.rb

@@ -87,4 +87,25 @@ module LogjamAgent
     EOS
   end
 
+  def self.event(label, extra_fields = {})
+    logjam_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)
+  end
+
+  private
+
+  def self.events_routing_key
+    "events.#{application_name}.#{environment_name}"
+  end
+
+  def self.forwarder
+    @forwarder ||= Forwarders.get(application_name, environment_name)
+  end
 end

data/lib/logjam_agent/amqp_forwarder.rb

@@ -23,12 +23,14 @@ module LogjamAgent
     end
 
     # TODO: mutex!
-    def forward(msg, engine)
+    def forward(msg, options = {})
       return if paused? || LogjamAgent.disabled
       begin
         # $stderr.puts msg
-        key = @config[:routing_key]
-        key += ".#{engine}" if engine
+        key = options[:routing_key] || @config[:routing_key]
+        if engine = options[:engine]
+          key += ".#{engine}"
+        end
         exchange.publish(msg, :key => key, :persistent => false)
       rescue Exception => exception
         reraise_expectation_errors!

data/lib/logjam_agent/request.rb

@@ -41,7 +41,7 @@ module LogjamAgent
 
     def forward
       engine = @fields.delete(:engine)
-      @forwarder.forward(encode_payload, engine)
+      @forwarder.forward(encode_payload, :engine => engine)
     rescue Exception => e
       handle_forwarding_error(e)
     end
@@ -52,7 +52,7 @@ module LogjamAgent
       def encode_payload
         Oj.dump(@fields, :mode => :compat)
       rescue
-        @fields.to_son
+        @fields.to_json
       end
     else
       def encode_payload

data/lib/logjam_agent/version.rb

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

data/lib/logjam_agent/zmq_forwarder.rb

@@ -56,11 +56,13 @@ module LogjamAgent
       @socket = nil
     end
 
-    def forward(msg, engine)
+    def forward(msg, options={})
       return if LogjamAgent.disabled
       begin
-        key = @config[:routing_key]
-        key += ".#{engine}" if engine
+        key = options[:routing_key] || @config[:routing_key]
+        if engine = options[:engine]
+          key += ".#{engine}"
+        end
         publish(key, msg)
       rescue Exception => exception
         reraise_expectation_errors!

metadata

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