logjam_agent 0.22.1 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cca5098317b3d3338b67eb29ee6a1989acd7faf
-  data.tar.gz: 41338b77ab2e005017455c9f26a9518a76d3ccb2
+  metadata.gz: 5b450bb1940271397b1a147f72691f2a57a00711
+  data.tar.gz: cf22fd46224d61afde9c0962498fb37c62366f03
 SHA512:
-  metadata.gz: d348f5ca4f773be3539c7be4bb6ac973eb1b1fbb013447b1ad454cb19fff9bd331120a666bcb492544360672ea5636a8518908830fc13ef10a00b44a211268a4
-  data.tar.gz: f26426cf92bac9d176ceacfed0c8bc8ac74df8d4c68cf1725627a0eddde98f5fefbbcb37119eb2f30e332c22d875c47a643e82a76b29347bc4be43ccaabf5a07
+  metadata.gz: 382bc6ae715dc409925743184e07910c1148a5131eaf99341367b87c7b01b10715a5b6b0c04b4900eeb41bbc4288376cb03970538546457e94c530b137c13c73
+  data.tar.gz: 1a637b93221de09270e83fa98640f813b670e51b80b67f123f22e741928d828838a6062a5cf1cf1eea493800061e4240b3d796f9458c4f0682a41a6bb5d09651

data/README.md

@@ -40,14 +40,13 @@ module LogjamAgent
 
   # Configure request data forwarder for ZeroMQ. Default options as given below.
   # The host parameter can be a comma separted list of zmq connection specifictions,
-  # where the protocol prefix and port suffix are optional. req_port, rcv_timeo and
-  # snd_timeo options only apply for sychronous messages (LogjamAgent.event).
+  # where the protocol prefix and port suffix are optional. rcv_timeo and
+  # snd_timeo options only apply for sychronous messages.
   add_forwarder(:zmq,
                 :host      => "localhost",
-                :port      => 9605,
-                :req_port  => 9604,
+                :port      => 9604,
                 :linger    => 1000,
-                :snd_hwm   => 100,
+                :snd_hwm   =>  100,
                 :rcv_timeo => 5000,
                 :snd_timeo => 5000)
 

data/lib/logjam_agent/util.rb

@@ -39,7 +39,7 @@ module LogjamAgent
     end
 
     def next_fixnum(i)
-      (i+=1) > FIXNUM_MAX ? 0 : i
+      (i+=1) > FIXNUM_MAX ? 1 : i
     end
 
     def pack_info(n)

data/lib/logjam_agent/version.rb

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

data/lib/logjam_agent/zmq_forwarder.rb

@@ -16,27 +16,20 @@ module LogjamAgent
       @sequence = SEQUENCE_START
     end
 
-    def push_connection_specs
-      @push_connection_specs ||= @config[:host].split(',').map do |host|
+    def connection_specs
+      @connection_specs ||= @config[:host].split(',').map do |host|
         augment_connection_spec(host, @config[:port])
       end
     end
 
-    def req_connection_specs
-      @req_connection_specs ||= @config[:host].split(',').sort_by{rand}.map do |host|
-        augment_connection_spec(host, @config[:req_port])
-      end
-    end
-
     def default_options
       {
-        :req_port     => 9604,
-        :port         => 9605,
-        :linger       => 1000,
-        :snd_hwm      => 100,
-        :rcv_hwm      => 100,
-        :rcv_timeo    => 5000,
-        :snd_timeo    => 5000
+        :port       => 9604,
+        :linger     => 1000,
+        :snd_hwm    =>  100,
+        :rcv_hwm    =>  100,
+        :rcv_timeo  => 5000,
+        :snd_timeo  => 5000
       }
     end
 
@@ -55,53 +48,26 @@ module LogjamAgent
       end
     end
 
-    def push_socket
-      return @push_socket if @push_socket
-      @push_socket = self.class.context.socket(ZMQ::PUSH)
-      at_exit { reset_push_socket }
-      @push_socket.setsockopt(ZMQ::LINGER, @config[:linger])
-      @push_socket.setsockopt(ZMQ::SNDHWM, @config[:snd_hwm])
-      push_connection_specs.each do |spec|
-        @push_socket.connect(spec)
-      end
-      @push_socket
-    end
-    alias socket push_socket
-
-    def req_socket
-      return @req_socket if @req_socket
-      @req_socket = self.class.context.socket(ZMQ::REQ)
-      at_exit { reset_req_socket }
-      @req_socket.setsockopt(ZMQ::LINGER, @config[:linger])
-      @req_socket.setsockopt(ZMQ::SNDHWM, @config[:snd_hwm])
-      @req_socket.setsockopt(ZMQ::RCVHWM, @config[:rcv_hwm])
-      @req_socket.setsockopt(ZMQ::RCVTIMEO, @config[:rcv_timeo])
-      @req_socket.setsockopt(ZMQ::SNDTIMEO, @config[:snd_timeo])
-      # @req_socket.setsockopt(ZMQ::REQ_CORRELATE, 1)
-      # @req_socket.setsockopt(ZMQ::REQ_RELAXED, 1)
-      req_connection_specs.each do |spec|
-        @req_socket.connect(spec)
-      end
-      @req_socket
-    end
-
-    def reset_push_socket
-      if @push_socket
-        @push_socket.close
-        @push_socket = nil
-      end
-    end
-
-    def reset_req_socket
-      if @req_socket
-        @req_socket.close
-        @req_socket = nil
+    def socket
+      return @socket if @socket
+      @socket = self.class.context.socket(ZMQ::DEALER)
+      at_exit { reset }
+      @socket.setsockopt(ZMQ::LINGER, @config[:linger])
+      @socket.setsockopt(ZMQ::SNDHWM, @config[:snd_hwm])
+      @socket.setsockopt(ZMQ::RCVHWM, @config[:rcv_hwm])
+      @socket.setsockopt(ZMQ::RCVTIMEO, @config[:rcv_timeo])
+      @socket.setsockopt(ZMQ::SNDTIMEO, @config[:snd_timeo])
+      connection_specs.each do |spec|
+        @socket.connect(spec)
       end
+      @socket
     end
 
     def reset
-      reset_push_socket
-      reset_req_socket
+      if @socket
+        @socket.close
+        @socket = nil
+      end
     end
 
     def forward(data, options={})
@@ -124,7 +90,7 @@ module LogjamAgent
     def publish(app_env, key, data)
       info = pack_info(@sequence = next_fixnum(@sequence))
       parts = [app_env, key, data, info]
-      if push_socket.send_strings(parts, ZMQ::DONTWAIT) < 0
+      if socket.send_strings(parts, ZMQ::DONTWAIT) < 0
         raise "ZMQ error on publishing: #{ZMQ::Util.error_string}"
       end
     end
@@ -135,29 +101,25 @@ module LogjamAgent
       LogjamAgent.error_handler.call ForwardingWarning.new(message)
     end
 
+    VALID_RESPONSE_CODES = [200,202]
+
     def send_receive(app_env, key, data)
-      # we don't need sequencing for synchronous calls
-      info = pack_info(SEQUENCE_START)
-      request_parts = [app_env, key, data, info]
+      info = pack_info(@sequence = next_fixnum(@sequence))
+      request_parts = ["", app_env, key, data, info]
       answer_parts = []
-      # we retry a few times relying on zeromq lib to pick servers to talk to
-      3.times do
-        if req_socket.send_strings(request_parts) < 0
-          log_warning "ZMQ error on sending: #{ZMQ::Util.error_string}"
-          reset_req_socket
-          next
-        end
-        if req_socket.recv_strings(answer_parts) < 0
-          log_warning "ZMQ error on receiving: #{ZMQ::Util.error_string}"
-          reset_req_socket
-          next
-        end
-        return if answer_parts.first == "200 OK"
-        answer_parts.clear
+      if socket.send_strings(request_parts) < 0
+        log_warning "ZMQ error on sending: #{ZMQ::Util.error_string}"
+        reset
+        return
+      end
+      if socket.recv_strings(answer_parts) < 0
+        log_warning "ZMQ error on receiving: #{ZMQ::Util.error_string}"
+        reset
+        return
+      end
+      if answer_parts.first != "" || !VALID_RESPONSE_CODES.include?(answer_parts.second.to_s.to_i)
+        log_warning "unexpected answer from logjam broker: #{answer_parts.inspect}"
       end
-      # if synchronous publishing fails, we just fall back to async
-      log_warning "could not publish sychronously, falling back to async"
-      publish(app_env, key, data)
     end
 
     if defined?(Mocha)

data/test/zmq_forwarder_test.rb

@@ -7,24 +7,14 @@ module LogjamAgent
       LogjamAgent.compression_method = NO_COMPRESSION
     end
 
-    test "sets up single push connection with default port" do
+    test "sets up single connection with default port" do
       f = ZMQForwarder.new(:host => "a.b.c", :port => 3001)
-      assert_equal ["tcp://a.b.c:3001"], f.push_connection_specs
+      assert_equal ["tcp://a.b.c:3001"], f.connection_specs
     end
 
-    test "sets up multiple push connections" do
+    test "sets up multiple 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.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
+      assert_equal %w(tcp://a.b.c:9604 tcp://x.y.z:9000 tcp://zmq.gnu.org:600), f.connection_specs
     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.1
+  version: 0.23.0
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake