logjam_agent 0.22.0 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e060a1fcd946ce3bc723bb408a90a08c16e650fb
-  data.tar.gz: 6aba597f82bca08b2ba2d6e67969d2602909f902
+  metadata.gz: 0cca5098317b3d3338b67eb29ee6a1989acd7faf
+  data.tar.gz: 41338b77ab2e005017455c9f26a9518a76d3ccb2
 SHA512:
-  metadata.gz: 36af34ac3b7cfae7f7e031fb24c2e14c8792c356688660b1df9f52cfcf837e81122ae341c5959f4462f5f657b302326a548ba3f499eb7d2c839368d168219653
-  data.tar.gz: 64c1a12ef9d4cce56fa863b5e002c46e2ace95c4f744df8199124c849f4b9590cdc1e099453409dee25cba82d368c04bcadae06c1b85862346f1363c176677a8
+  metadata.gz: d348f5ca4f773be3539c7be4bb6ac973eb1b1fbb013447b1ad454cb19fff9bd331120a666bcb492544360672ea5636a8518908830fc13ef10a00b44a211268a4
+  data.tar.gz: f26426cf92bac9d176ceacfed0c8bc8ac74df8d4c68cf1725627a0eddde98f5fefbbcb37119eb2f30e332c22d875c47a643e82a76b29347bc4be43ccaabf5a07

data/lib/logjam_agent/railtie.rb

@@ -78,16 +78,17 @@ module LogjamAgent
       # patch controller testing to create a logjam request, because middlewares aren't executed
       if Rails.env.test?
         ActiveSupport.on_load(:action_controller) do
-          module TestWithLogjamStartRequest
-            def process(*args)
+          require 'action_controller/test_case'
+          module ActionController::TestCase::Behavior
+            def process_with_logjam(*args)
               LogjamAgent.start_request
-              super
+              process_without_logjam(*args)
             ensure
               LogjamAgent.finish_request
             end
+            alias_method :process_without_logjam, :process
+            alias_method :process, :process_with_logjam
           end
-          require 'action_controller/test_case'
-          ActionController::TestCase.prepend TestWithLogjamStartRequest
         end
       end
     end

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.22.0"
+  VERSION = "0.22.1"
 end

data/lib/logjam_agent/zmq_forwarder.rb

@@ -1,6 +1,6 @@
 module LogjamAgent
   class ZMQForwarder
-    attr_reader :app, :env, :connection_specs
+    attr_reader :app, :env
 
     include Util
 

data/test/zmq_forwarder_test.rb

@@ -7,14 +7,24 @@ module LogjamAgent
       LogjamAgent.compression_method = NO_COMPRESSION
     end
 
-    test "sets up single connection with default port" do
+    test "sets up single push connection with default port" do
       f = ZMQForwarder.new(:host => "a.b.c", :port => 3001)
-      assert_equal ["tcp://a.b.c:3001"], f.connection_specs
+      assert_equal ["tcp://a.b.c:3001"], f.push_connection_specs
     end
 
-    test "sets up multiple connections" do
+    test "sets up multiple push connections" do
       f = ZMQForwarder.new(:host => "a.b.c,tcp://x.y.z:9000,zmq.gnu.org:600")
-      assert_equal %w(tcp://a.b.c:9605 tcp://x.y.z:9000 tcp://zmq.gnu.org:600), f.connection_specs
+      assert_equal %w(tcp://a.b.c:9605 tcp://x.y.z:9000 tcp://zmq.gnu.org:600), f.push_connection_specs
+    end
+
+    test "sets up single req connection with default port" do
+      f = ZMQForwarder.new(:host => "a.b.c", :req_port => 3001)
+      assert_equal ["tcp://a.b.c:3001"], f.req_connection_specs
+    end
+
+    test "sets up multiple req connections" do
+      f = ZMQForwarder.new(:host => "a.b.c,tcp://x.y.z:9000,zmq.gnu.org:600")
+      assert_equal %w(tcp://a.b.c:9604 tcp://x.y.z:9000 tcp://zmq.gnu.org:600).sort, f.req_connection_specs.sort
     end
 
     test "encodes the payload" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.22.1
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake