logjam_agent 0.21.1 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea9a62d060e64b9e7436c8f1035b2e4be80abab1
-  data.tar.gz: 670e2bc6959c2e333ea179e0c3a8d7cf942d8053
+  metadata.gz: e060a1fcd946ce3bc723bb408a90a08c16e650fb
+  data.tar.gz: 6aba597f82bca08b2ba2d6e67969d2602909f902
 SHA512:
-  metadata.gz: a4bfe1a2517ac4f1ae323d00bc1ac0a625b7736381ce748ecdc4adac671be39d7be1737b6025a97a66fcdf42507b740076af052dc4dbc2c974b5da1ee52a5349
-  data.tar.gz: 71ba01d7b5a98417c12775ca842f050c02bed3ce518ba84f85ba27173e57e06692b8ac0fc020e06454db4906f237d2941bdfd01f4176e9b10f81f194273dd56f
+  metadata.gz: 36af34ac3b7cfae7f7e031fb24c2e14c8792c356688660b1df9f52cfcf837e81122ae341c5959f4462f5f657b302326a548ba3f499eb7d2c839368d168219653
+  data.tar.gz: 64c1a12ef9d4cce56fa863b5e002c46e2ace95c4f744df8199124c849f4b9590cdc1e099453409dee25cba82d368c04bcadae06c1b85862346f1363c176677a8

data/README.md

@@ -39,13 +39,17 @@ module LogjamAgent
   # self.application_revision = "f494e11afa0738b279517a2a96101a952052da5d"
 
   # 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.
+  # 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).
   add_forwarder(:zmq,
-                :host    => "localhost",
-                :port    => 9605,
-                :linger  => 1000,
-                :snd_hwm => 100)
+                :host      => "localhost",
+                :port      => 9605,
+                :req_port  => 9604,
+                :linger    => 1000,
+                :snd_hwm   => 100,
+                :rcv_timeo => 5000,
+                :snd_timeo => 5000)
 
   # Configure request data forwarder for AMQP.
   # add_forwarder(:amqp, :host => "message.broker.at.your.org")
@@ -126,7 +130,7 @@ LogjamAgent.error_handler = lambda {|exception| ... }
 
 The MIT License
 
-Copyright (c) 2013 - 2015 Stefan Kaes
+Copyright (c) 2013 - 2016 Stefan Kaes
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/logjam_agent/version.rb

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

data/lib/logjam_agent/zmq_forwarder.rb

@@ -4,6 +4,8 @@ module LogjamAgent
 
     include Util
 
+    SEQUENCE_START = 0
+
     def initialize(*args)
       opts = args.extract_options!
       @app = args[0] || LogjamAgent.application_name
@@ -11,17 +13,30 @@ module LogjamAgent
       @app_env = "#{@app}-#{@env}"
       @config = default_options.merge!(opts)
       @config[:host] = "localhost" if @config[:host].blank?
-      @connection_specs = @config[:host].split(',').map do |host|
+      @sequence = SEQUENCE_START
+    end
+
+    def push_connection_specs
+      @push_connection_specs ||= @config[:host].split(',').map do |host|
         augment_connection_spec(host, @config[:port])
       end
-      @sequence = 0
+    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
       }
     end
 
@@ -40,22 +55,53 @@ module LogjamAgent
       end
     end
 
-    def socket
-      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)
+    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
       end
-      @socket
     end
 
     def reset
-      return unless @socket
-      @socket.close
-      @socket = nil
+      reset_push_socket
+      reset_req_socket
     end
 
     def forward(data, options={})
@@ -65,7 +111,11 @@ module LogjamAgent
         key += ".#{engine}"
       end
       msg = LogjamAgent.encode_payload(data)
-      publish(app_env, key, msg)
+      if options[:sync]
+        send_receive(app_env, key, msg)
+      else
+        publish(app_env, key, msg)
+      end
     rescue => error
       reraise_expectation_errors!
       raise ForwardingError.new(error.message)
@@ -74,13 +124,42 @@ module LogjamAgent
     def publish(app_env, key, data)
       info = pack_info(@sequence = next_fixnum(@sequence))
       parts = [app_env, key, data, info]
-      if socket.send_strings(parts, ZMQ::DONTWAIT) < 0
-        raise "ZMQ error: #{ZMQ::Util.error_string}"
+      if push_socket.send_strings(parts, ZMQ::DONTWAIT) < 0
+        raise "ZMQ error on publishing: #{ZMQ::Util.error_string}"
       end
     end
 
     private
 
+    def log_warning(message)
+      LogjamAgent.error_handler.call ForwardingWarning.new(message)
+    end
+
+    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]
+      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
+      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)
       def reraise_expectation_errors! #:nodoc:
         raise if $!.is_a?(Mocha::ExpectationError)

data/lib/logjam_agent.rb

@@ -50,6 +50,7 @@ end
 module LogjamAgent
 
   class ForwardingError < StandardError; end
+  class ForwardingWarning < StandardError; end
 
   mattr_accessor :logger
   self.logger = nil
@@ -241,10 +242,11 @@ module LogjamAgent
     fields = {
       :label      => label,
       :started_at => Time.now.iso8601,
-      :host       => hostname
+      :host       => hostname,
+      :uuid       => generate_uuid
     }
     fields.merge!(extra_fields)
-    forwarder.forward(fields, :routing_key => events_routing_key)
+    forwarder.forward(fields, :routing_key => events_routing_key, :sync => true)
   end
 
   def self.add_forwarder(type, *args)

metadata

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