logjam_agent 0.19.3 → 0.19.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1634e5c22844025d52a1a2e26e95ed219cc935b5
-  data.tar.gz: 9612717c779312008965b7401e7f13f241b7c710
+  metadata.gz: 4bffe54ae7a2f79b516804c95ecf2a2272d3b1b7
+  data.tar.gz: 280a394d54ecf5d7fcb84dd78c15222746b77d2a
 SHA512:
-  metadata.gz: f9abd9d795fa18d84f0baa1142967922e44f130cf607ac4b63f23ccd2e81c570455d5e40b21d98ffa54b396ba44a6baddf2d803f24cea4dab9eb2128da192a90
-  data.tar.gz: 1d6d570cfc85e36356cf8b62ef94be560e6319aea29d00ea947641e0ea5829f50aebdd6a0e530deee296a08d165a54b335aee32078aa4578a536f18007b7e737
+  metadata.gz: 00581356bef24ce775b29f9a201f2635909fb0fd36f73c9f0db2a741d40b3224d8557c2a7d57c17f964e4cffd2c213d78fa2c3a484fccdc4a5650cab6988362b
+  data.tar.gz: be04344959f08f5ee808e12f0c8450984e2d02f7ffddef88ba62c65f8c1b38fa63d74aa2b9fcd73e1cb3fcffd08de3212daebc64a81266392d7b270bb2efcab6

data/lib/logjam_agent/railtie.rb

@@ -72,6 +72,9 @@ module LogjamAgent
 
       LogjamAgent.application_revision = `git rev-parse HEAD 2>/dev/null`.chomp rescue ""
 
+      # disable logjam request forwarding by default in test environment
+      LogjamAgent.disable! if Rails.env.test?
+
       # patch controller testing to create a logjam request, because middlewares aren't executed
       if Rails.env.test?
         ActiveSupport.on_load(:action_controller) do

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.19.3"
+  VERSION = "0.19.4"
 end

data/lib/logjam_agent/zmq_forwarder.rb

@@ -1,6 +1,6 @@
 module LogjamAgent
   class ZMQForwarder
-    attr_reader :app, :env
+    attr_reader :app, :env, :connection_specs
 
     include Util
 
@@ -10,24 +10,21 @@ module LogjamAgent
       @env = args[1] || LogjamAgent.environment_name
       @app_env = "#{@app}-#{@env}"
       @config = default_options.merge!(opts)
+      @config[:host] = "localhost" if @config[:host].blank?
+      @connection_specs = @config[:host].split(',').map do |host|
+        augment_connection_spec(host, @config[:port])
+      end
       @sequence = 0
     end
 
     def default_options
       {
-        :host         => "localhost",
         :port         => 9605,
         :linger       => 100,
         :snd_hwm      => 100,
       }
     end
 
-    def connection_specs
-      @connection_specs ||= @config[:host].split(',').map do |host|
-        augment_connection_spec(host, @config[:port])
-      end
-    end
-
     @@mutex = Mutex.new
     @@zmq_context = nil
 
@@ -44,17 +41,15 @@ module LogjamAgent
     end
 
     def socket
-      @socket ||=
-        begin
-          socket = self.class.context.socket(ZMQ::PUSH)
-          socket.setsockopt(ZMQ::LINGER, @config[:linger])
-          socket.setsockopt(ZMQ::SNDHWM, @config[:snd_hwm])
-          connection_specs.each do |spec|
-            socket.connect(spec)
-          end
-          at_exit { reset }
-          socket
-        end
+      return @socket if @socket
+      @socket = self.class.context.socket(ZMQ::PUSH)
+      at_exit { reset }
+      @socket.setsockopt(ZMQ::LINGER, @config[:linger])
+      @socket.setsockopt(ZMQ::SNDHWM, @config[:snd_hwm])
+      @connection_specs.each do |spec|
+        @socket.connect(spec)
+      end
+      @socket
     end
 
     def reset

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.19.3
+  version: 0.19.4
 platform: ruby
 authors:
 - Stefan Kaes