logjam_agent 0.23.1 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3151059f16592e18c8550de624b88c46b1414b96
-  data.tar.gz: 62c4c3080034425cc3913e33b0fc0c6f4e864351
+  metadata.gz: c6c253f6df759f9f8a7b79293322ccfb0882879b
+  data.tar.gz: 24fbe446d05453f171525b86512df8024cd90630
 SHA512:
-  metadata.gz: d15974461ebc2001e75e04fba03d5efebbbe275dfd8f0f5722e6bf99d8c7b4193646132dfc69972f9bd6cbb424ef858f552cfafb0f6284948e334b411a97085f
-  data.tar.gz: 246250717c49e5d8c30afaca33e6db3fb254376d9642c96a6274e61183a05a720d98327ae289478b777c2e124d8690f081e220d65e3fe20fc2396504d8904246
+  metadata.gz: 83a13509eeac07120169e3f3ce3a54c69d19dd25db89c4575abe6dfc61ecde4e5c313b12020ca8381cdfb4489ced54aabed12ef9cdf1c74f9c325e830312a363
+  data.tar.gz: e97adc17d96c2069230c1ef54b922a74d1c50f980555cb240ff721dfbb2459d3185f81abede1fa6fe6595df17ce5e8368a05334d3057aa7fa1b0c37129e21435

data/lib/logjam_agent/util.rb

@@ -42,8 +42,8 @@ module LogjamAgent
       (i+=1) > FIXNUM_MAX ? 1 : i
     end
 
-    def pack_info(n)
-      info = [META_INFO_TAG, LogjamAgent.compression_method, META_INFO_VERSION, META_INFO_DEVICE_NUMBER].pack("nCCN")
+    def pack_info(n, compression_method = LogjamAgent.compression_method)
+      info = [META_INFO_TAG, compression_method, META_INFO_VERSION, META_INFO_DEVICE_NUMBER].pack("nCCN")
       info << pack_uint64_big_endian(zclock_time)
       info << pack_uint64_big_endian(n)
     end

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.23.1"
+  VERSION = "0.24.0"
 end

data/lib/logjam_agent/zmq_forwarder.rb

@@ -51,7 +51,7 @@ module LogjamAgent
     def socket
       return @socket if @socket
       @socket = self.class.context.socket(ZMQ::DEALER)
-      at_exit { reset }
+      at_exit { ping; reset }
       @socket.setsockopt(ZMQ::LINGER, @config[:linger])
       @socket.setsockopt(ZMQ::SNDHWM, @config[:snd_hwm])
       @socket.setsockopt(ZMQ::RCVHWM, @config[:rcv_hwm])
@@ -103,23 +103,30 @@ module LogjamAgent
 
     VALID_RESPONSE_CODES = [200,202]
 
-    def send_receive(app_env, key, data)
-      info = pack_info(@sequence = next_fixnum(@sequence))
+    def send_receive(app_env, key, data, compression_method = LogjamAgent.compression_method)
+      info = pack_info(@sequence = next_fixnum(@sequence), compression_method)
       request_parts = ["", app_env, key, data, info]
       answer_parts = []
       if socket.send_strings(request_parts) < 0
         log_warning "ZMQ error on sending: #{ZMQ::Util.error_string}"
         reset
-        return
+        return nil
       end
       if socket.recv_strings(answer_parts) < 0
         log_warning "ZMQ error on receiving: #{ZMQ::Util.error_string}"
         reset
-        return
+        return nil
       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
+      answer_parts.second
+    end
+
+    def ping
+      unless send_receive("ping", "", "{}", NO_COMPRESSION)
+        log_warning "failed to receive pong"
+      end
     end
 
     if defined?(Mocha)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.24.0
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake