logjam_agent 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8ac86d7887f904a1a41d57bf8b77eb69019d7f2
-  data.tar.gz: e5ad10647f5ef3eea08c4b9e73ba0b797969ff45
+  metadata.gz: 72a34b22839e58224f3a3fa8fd1630c31fe66167
+  data.tar.gz: a2549cab27b6cd2c8437b48f9a7f41258440bd97
 SHA512:
-  metadata.gz: f7b1184a841e9bae84f4c31463c25c2888ec841b049d18be4e7f82c6ff2581ed3f6b4edc99656ec84a04feba1fd88c9e8042ec7ab24be64f59413e8a9fbda06f
-  data.tar.gz: 32cfaf66cc6db7aa5ae9fa4609b9d2f547f45d3905955434c820274eee41f53d05cebe203cd2336cd0467e28ce04caef6da1bc5e8564680583fe5e51903c26c3
+  metadata.gz: 85b8e013121eca92a8b06227c63be49c111ed3397fbe29c15bc3d14e8553d9ce97b1f7054371d8ecddec81aa6c534bb95c194cf4a62951cf318200011c6112f2
+  data.tar.gz: 5c007b20a6b1c7318cc167895bd66734f2dc6d1e24b9a6ae6b451d9141577bafc78ed73fe2b3fc18e4a41c7442ebf921c74003316c6107a4d1117408e9387927

data/lib/logjam_agent/amqp_forwarder.rb

@@ -11,19 +11,19 @@ module LogjamAgent
       opts = args.extract_options!
       @app = args[0] || LogjamAgent.application_name
       @env = args[1] || LogjamAgent.environment_name
-      @config = default_options(@app, @env).merge!(opts)
-      @exchange = @bunny = nil
+      @app_env = "#{@app}-#{@env}"
+      @config = default_options.merge!(opts)
+      @exchanges = {}
+      @bunny = nil
       @sequence = 0
       ensure_bunny_gem_is_available
     end
 
-    def default_options(app, env)
+    def default_options
       {
         :host                 => "localhost",
-        :exchange             => "request-stream-#{app}-#{env}",
         :exchange_durable     => true,
         :exchange_auto_delete => false,
-        :routing_key          => "logs.#{app}.#{env}"
       }
     end
 
@@ -31,13 +31,13 @@ module LogjamAgent
     def forward(msg, options = {})
       return if paused? || LogjamAgent.disabled
       begin
-        # $stderr.puts msg
-        key = options[:routing_key] || @config[:routing_key]
+        app_env = options[:app_env] || @app_env
+        key = options[:routing_key] || "logs.#{app_env.sub('-','.')}"
         if engine = options[:engine]
           key += ".#{engine}"
         end
         info = pack_info(@sequence = next_fixnum(@sequence))
-        exchange.publish(msg, :key => key, :persistent => false, :headers => {:info => info})
+        exchange(app_env).publish(msg, :key => key, :persistent => false, :headers => {:info => info})
       rescue => error
         reraise_expectation_errors!
         pause(error)
@@ -55,7 +55,8 @@ module LogjamAgent
       rescue
         # if bunny throws an exception here, its not usable anymore anyway
       ensure
-        @exchange = @bunny = nil
+        @exchanges = {}
+        @bunny = nil
       end
     end
 
@@ -81,11 +82,11 @@ module LogjamAgent
       @paused && @paused > RETRY_AFTER.ago
     end
 
-    def exchange
-      @exchange ||=
+    def exchange(app_env)
+      @exchanges[app_env] ||=
         begin
           bunny.start unless bunny.connected?
-          bunny.exchange(@config[:exchange],
+          bunny.exchange("request-stream-#{app_env}",
                          :durable => @config[:exchange_durable],
                          :auto_delete => @config[:exchange_auto_delete],
                          :type => :topic)

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.11.1"
+  VERSION = "0.11.2"
 end

data/lib/logjam_agent/zmq_forwarder.rb

@@ -8,17 +8,16 @@ module LogjamAgent
       opts = args.extract_options!
       @app = args[0] || LogjamAgent.application_name
       @env = args[1] || LogjamAgent.environment_name
-      @config = default_options(@app, @env).merge!(opts)
       @app_env = "#{@app}-#{@env}"
+      @config = default_options.merge!(opts)
       @zmq_hosts = Array(@config[:host])
       @zmq_port = @config[:port]
       @sequence = 0
     end
 
-    def default_options(app, env)
+    def default_options
       {
         :host         => "localhost",
-        :routing_key  => "logs.#{app}.#{env}",
         :port         => 12345
       }
     end
@@ -54,7 +53,6 @@ module LogjamAgent
 
     def reset
       return unless @socket
-      # $stderr.puts "closing socket"
       @socket.close
       @socket = nil
     end
@@ -62,20 +60,21 @@ module LogjamAgent
     def forward(msg, options={})
       return if LogjamAgent.disabled
       begin
-        key = options[:routing_key] || @config[:routing_key]
+        app_env = options[:app_env] || @app_env
+        key = options[:routing_key] || "logs.#{app_env.sub('-','.')}"
         if engine = options[:engine]
           key += ".#{engine}"
         end
-        publish(key, msg)
+        publish(app_env, key, msg)
       rescue => error
         reraise_expectation_errors!
         raise ForwardingError.new(error.message)
       end
     end
 
-    def publish(key, data)
+    def publish(app_env, key, data)
       info = pack_info(@sequence = next_fixnum(@sequence))
-      parts = [@app_env, key, data, info]
+      parts = [app_env, key, data, info]
       if socket.send_strings(parts, ZMQ::DONTWAIT) < 0
         raise "ZMQ error: #{ZMQ::Util.error_string}"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake