logjam_agent 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 123f61f59722d0577eef1875ed53866c2b550e55
-  data.tar.gz: 63fdabfc535c0efa652f41457f4a0abdfada5c90
+  metadata.gz: eb7dd078b4e735ccb32401f999b8c298b1cb6b4d
+  data.tar.gz: 632a1219c3214cdb0ff26a6891e0252eec598879
 SHA512:
-  metadata.gz: d74becfed4e7fb8b03a461b100a62c4f371f70753776d726c7de4d43552cad7f27997198d3eddf85e9baed38510e2e98f84c32522a264d27c36d5e0c16bd9588
-  data.tar.gz: fe092f147ac1245f7801d9b97310ba09eea2a2c238e8460395286db571ae6ceaad88ad69c8e2f0ae42bac9e05704262e64e7f81408273fd85244866623b769db
+  metadata.gz: 422bed88a1ac4314ed28054d9ac2eccdcbfeac08939db5ecd45f4d31f5ca8b199f7e6471d6e83cc42dd802ee2f6355e507babba268904906d0428673775560b9
+  data.tar.gz: 332cead3c74ab1f555cc36bf2e4dc95d2882e8eae94c6899db2ba3bd359fab09af7996e576e00ae0d7eb54e28aa8f05250d5094d4032e29dad1af206e222fc3b

data/lib/logjam_agent/amqp_forwarder.rb

@@ -29,7 +29,7 @@ module LogjamAgent
 
     # TODO: mutex!
     def forward(msg, options = {})
-      return if paused? || LogjamAgent.disabled
+      return if paused?
       begin
         app_env = options[:app_env] || @app_env
         key = options[:routing_key] || "logs.#{app_env.sub('-','.')}"

data/lib/logjam_agent/request.rb

@@ -78,7 +78,7 @@ module LogjamAgent
     end
 
     def forward
-      return if @ignored
+      return if @ignored || LogjamAgent.disabled
       engine = @fields.delete(:engine)
       # puts @fields.inspect
       @forwarder.forward(LogjamAgent.encode_payload(@fields), :engine => engine)

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.13.2"
+  VERSION = "0.13.3"
 end

data/lib/logjam_agent/zmq_forwarder.rb

@@ -58,18 +58,15 @@ module LogjamAgent
     end
 
     def forward(msg, options={})
-      return if LogjamAgent.disabled
-      begin
-        app_env = options[:app_env] || @app_env
-        key = options[:routing_key] || "logs.#{app_env.sub('-','.')}"
-        if engine = options[:engine]
-          key += ".#{engine}"
-        end
-        publish(app_env, key, msg)
-      rescue => error
-        reraise_expectation_errors!
-        raise ForwardingError.new(error.message)
+      app_env = options[:app_env] || @app_env
+      key = options[:routing_key] || "logs.#{app_env.sub('-','.')}"
+      if engine = options[:engine]
+        key += ".#{engine}"
       end
+      publish(app_env, key, msg)
+    rescue => error
+      reraise_expectation_errors!
+      raise ForwardingError.new(error.message)
     end
 
     def publish(app_env, key, data)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: logjam_agent
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Logjam client library to be used with logjam