logjam_agent 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b543de9e4f7a8d5ae896a7c2fa4524a8b220a1dad8a6b4e1be6b5eee4c8110e
-  data.tar.gz: 62f2aee617a120107307e625b2ba2df8fb461f53ba9fa3baff0ce0187fc1325f
+  metadata.gz: df4bc6a68ce75215afa172d8247bffc2fd1192651e2410e26d4c298500bf4934
+  data.tar.gz: 54067782beccfe222468f27d1062d4c8cf65f9dd7e4fd94abaa24e2f3eaa46fc
 SHA512:
-  metadata.gz: ec3578d040a1033e06029caf81256e6524a66a7c8c24493e986e467a603564e53b22cc05eadf243a3310ccfb8b3b065c012759e5d21d2acd9e64b597e4fb6710
-  data.tar.gz: ed17803ea6301229c58b82e2886cf82bb36fa88554567f5864e0d38df653a2b2a07fe76160b49de55ef03619b745608e95648364532f3f7e465021a558ae7ae1
+  metadata.gz: 2eec84c0f349756469546bb35d0ae047585149e9c11429daad6701d98a4d104c9ab4161aa342be12790fd9eb46a4ee47c766a7e8cd3930388e584b31317ecf90
+  data.tar.gz: 941264e9a1eeeedf6a44748d02e8fb825c59402e28fb66244f3ff9b1045dfa097d5763503ad23b8ff53398560684a576462f1084343b9f2d539e9b37ff9c3386

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.31.0"
+  VERSION = "0.32.0"
 end

data/lib/logjam_agent/zmq_forwarder.rb

@@ -16,6 +16,7 @@ module LogjamAgent
       @sequence = SEQUENCE_START
       @socket = nil
       @ping_ensured = false
+      @socket_mutex = Mutex.new
     end
 
     def connection_specs
@@ -35,11 +36,11 @@ module LogjamAgent
       }
     end
 
-    @@mutex = Mutex.new
+    @@context_mutex = Mutex.new
     @@zmq_context = nil
 
     def self.context
-      @@mutex.synchronize do
+      @@context_mutex.synchronize do
         @@zmq_context ||=
           begin
             require 'ffi-rzmq'
@@ -50,29 +51,12 @@ module LogjamAgent
       end
     end
 
-    def socket
-      return @socket if @socket
-      @socket = self.class.context.socket(ZMQ::DEALER)
-      raise "ZMQ error on socket creation: #{ZMQ::Util.error_string}" if @socket.nil?
-      if LogjamAgent.ensure_ping_at_exit
-        ensure_ping_at_exit
-      else
-        at_exit { reset }
-      end
-      @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])
-      spec = connection_specs.sort_by{rand}.first
-      @socket.connect(spec)
-      @socket
-    end
-
     def reset
-      if @socket
-        @socket.close
-        @socket = nil
+      @socket_mutex.synchronize do
+        if @socket
+          @socket.close
+          @socket = nil
+        end
       end
     end
 
@@ -89,16 +73,40 @@ module LogjamAgent
         key += ".#{engine}"
       end
       msg = LogjamAgent.encode_payload(data)
-      if options[:sync]
-        send_receive(app_env, key, msg)
-      else
-        publish(app_env, key, msg)
+      @socket_mutex.synchronize do
+        if options[:sync]
+          send_receive(app_env, key, msg)
+        else
+          publish(app_env, key, msg)
+        end
       end
     rescue => error
       reraise_expectation_errors!
       raise ForwardingError.new(error.message)
     end
 
+    private
+
+    # this method assumes the caller holds the socket mutex
+    def socket
+      return @socket if @socket
+      @socket = self.class.context.socket(ZMQ::DEALER)
+      raise "ZMQ error on socket creation: #{ZMQ::Util.error_string}" if @socket.nil?
+      if LogjamAgent.ensure_ping_at_exit
+        ensure_ping_at_exit
+      else
+        at_exit { reset }
+      end
+      @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])
+      spec = connection_specs.sort_by{rand}.first
+      @socket.connect(spec)
+      @socket
+    end
+
     def publish(app_env, key, data)
       info = pack_info(@sequence = next_fixnum(@sequence))
       parts = [app_env, key, data, info]
@@ -109,8 +117,6 @@ module LogjamAgent
       end
     end
 
-    private
-
     def log_warning(message)
       LogjamAgent.error_handler.call ForwardingWarning.new(message)
     end
@@ -138,8 +144,10 @@ module LogjamAgent
     end
 
     def ping
-      if @socket && !send_receive("ping", @app_env, "{}", NO_COMPRESSION)
-        log_warning "failed to receive pong"
+      @socket_mutex.synchronize do
+        if @socket && !send_receive("ping", @app_env, "{}", NO_COMPRESSION)
+          log_warning "failed to receive pong"
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-05 00:00:00.000000000 Z
+date: 2020-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake