log-courier 1.0.21.ga82ca4c → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 480d6e6a5958b6f307727dfa1713e8a9c0a10d29
-  data.tar.gz: 2f2de7aeedd2e539a16412dd40f8321ecc9cff20
+  metadata.gz: 68e7cf906de75f2ac3838d007c24380f0e8a3740
+  data.tar.gz: dadf3d48bb4302f35be2255e1d168bb1699cde04
 SHA512:
-  metadata.gz: 3d2d449239c58e05a7654ad0f77148b2fd8ac5ebf0094f50b85c7311cb904650cc426a55aa2918a9b9334c70c283ca1d7aa47cb47c94b0999011bfc0949270b7
-  data.tar.gz: 8e51f6507f0b12a7ed56a17fb28213ea9a7f71b5257544c8191ad19bb70e91f1c6a8e940d37203fab587f3c564deb0551426fc8996081a7101faaf707d014748
+  metadata.gz: 5eae260c97dc6d05ffca1c7160aaeb153289020e289335948a5ca3fc96019c2b418a8fe6d5846ad53ca7b7f9a569d3679acc870f40743f14f86618ac97ac6c9e
+  data.tar.gz: 16fe209e290aedb5fefc707733d5860889dbb3a11ff4900b1c04543729bf184072142250ab9bdca398f1363052ce11c5d94645a00ca4ec108338b74cb106dd94

data/lib/log-courier/client.rb

@@ -22,10 +22,11 @@ require 'multi_json'
 require 'thread'
 require 'zlib'
 
+class NativeException; end
+
 module LogCourier
-  # TODO: Make these shared
-  class ClientShutdownSignal < StandardError; end
-  class ClientProtocolError < StandardError; end
+  class ShutdownSignal < StandardError; end
+  class ProtocolError < StandardError; end
 
   # Describes a pending payload
   class PendingPayload
@@ -93,8 +94,8 @@ module LogCourier
 
     def shutdown
       # Raise a shutdown signal in the spooler and wait for it
-      @spooler_thread.raise ClientShutdownSignal
-      @io_thread.raise ClientShutdownSignal
+      @spooler_thread.raise ShutdownSignal
+      @io_thread.raise ShutdownSignal
       @spooler_thread.join
       @io_thread.join
     end
@@ -123,7 +124,7 @@ module LogCourier
           @io_control << ['E', spooled]
         end
       end
-    rescue ClientShutdownSignal
+    rescue ShutdownSignal
       # Just shutdown
       0
     end
@@ -224,13 +225,13 @@ module LogCourier
             # Reset keepalive timeout
             reset_keepalive
           end
-        rescue ClientProtocolError => e
+        rescue ProtocolError => e
           # Reconnect required due to a protocol error
           @logger.warn("[LogCourierClient] Protocol error: #{e}") unless @logger.nil?
         rescue TimeoutError
           # Reconnect due to timeout
           @logger.warn('[LogCourierClient] Timeout occurred') unless @logger.nil?
-        rescue ClientShutdownSignal
+        rescue ShutdownSignal
           # Shutdown, break out
           break
         rescue => e
@@ -311,7 +312,7 @@ module LogCourier
     def process_pong(message)
       # Sanity
       if message.length != 0
-        raise ClientProtocolError, "Unexpected data attached to pong message (#{message.length})"
+        raise ProtocolError, "Unexpected data attached to pong message (#{message.length})"
       end
 
       # No longer pending a PONG
@@ -321,7 +322,7 @@ module LogCourier
     def process_ackn(message)
       # Sanity
       if message.length != 20
-        raise ClientProtocolError, "ACKN message size invalid (#{message.length})"
+        raise ProtocolError, "ACKN message size invalid (#{message.length})"
       end
 
       # Grab nonce

data/lib/log-courier/client_tls.rb

@@ -54,7 +54,7 @@ module LogCourier
     def connect(io_control)
       begin
         tls_connect
-      rescue ClientShutdownSignal
+      rescue ShutdownSignal
         raise
       rescue
         # TODO: Make this configurable
@@ -74,9 +74,9 @@ module LogCourier
     end
 
     def disconnect
-      @send_thread.raise ClientShutdownSignal
+      @send_thread.raise ShutdownSignal
       @send_thread.join
-      @recv_thread.raise ClientShutdownSignal
+      @recv_thread.raise ShutdownSignal
       @recv_thread.join
     end
 
@@ -111,7 +111,7 @@ module LogCourier
     rescue OpenSSL::SSL::SSLError, IOError, Errno::ECONNRESET => e
       @logger.warn("[LogCourierClient] SSL write error: #{e}") unless @logger.nil?
       io_control << ['F']
-    rescue ClientShutdownSignal
+    rescue ShutdownSignal
       # Just shutdown
     rescue => e
       @logger.warn("[LogCourierClient] Unknown SSL write error: #{e}") unless @logger.nil?
@@ -147,7 +147,7 @@ module LogCourier
     rescue EOFError
       @logger.warn("[LogCourierClient] Connection closed by server") unless @logger.nil?
       io_control << ['F']
-    rescue ClientShutdownSignal
+    rescue ShutdownSignal
       # Just shutdown
     rescue => e
       @logger.warn("[LogCourierClient] Unknown SSL read error: #{e}") unless @logger.nil?
@@ -206,12 +206,13 @@ module LogCourier
       socket
     rescue OpenSSL::SSL::SSLError, IOError, Errno::ECONNRESET => e
       @logger.warn("[LogCourierClient] Connection to #{@options[:addresses][0]}:#{@options[:port]} failed: #{e}") unless @logger.nil?
-    rescue ClientShutdownSignal
+    rescue ShutdownSignal
       # Just shutdown
       0
-    rescue => e
+    rescue StandardError, NativeException => e
       @logger.warn("[LogCourierClient] Unknown connection failure to #{@options[:addresses][0]}:#{@options[:port]}: #{e}") unless @logger.nil?
       @logger.warn("[LogCourierClient] #{e.backtrace}: #{e.message} (#{e.class})") unless @logger.nil?
+      raise e
     end
   end
 end

data/lib/log-courier/server.rb

@@ -22,6 +22,8 @@ require 'multi_json'
 require 'thread'
 require 'zlib'
 
+class NativeException; end
+
 module LogCourier
   class TimeoutError < StandardError; end
   class ShutdownSignal < StandardError; end
@@ -158,7 +160,7 @@ module LogCourier
         # Decode the JSON
         begin
           event = @json_adapter.load(data_buf, @json_options)
-        rescue MultiJson::ParserError => e
+        rescue MultiJson::ParseError => e
           @logger.warn("[LogCourierServer] JSON parse failure, falling back to plain-text: #{e}") unless @logger.nil?
           event = { 'message' => data_buf }
         end
@@ -169,6 +171,7 @@ module LogCourier
         rescue TimeoutError
           # Full pipeline, partial ack
           # NOTE: comm.send can raise a Timeout::Error of its own
+          @logger.debug "[LogCourierServer] Partially acknowledging message #{nonce.hash} sequence #{sequence}" unless @logger.nil?
           comm.send 'ACKN', [nonce, sequence].pack('A*N')
           ack_timeout = Time.now.to_i + 5
           retry
@@ -179,6 +182,7 @@ module LogCourier
 
       # Acknowledge the full message
       # NOTE: comm.send can raise a Timeout::Error
+      @logger.debug "[LogCourierServer] Acknowledging message #{nonce.hash} sequence #{sequence}" unless @logger.nil?
       comm.send 'ACKN', [nonce, sequence].pack('A*N')
     end
   end

data/lib/log-courier/server_tcp.rb

@@ -100,7 +100,7 @@ module LogCourier
         end
 
         if @options[:port] == 0
-          @logger.warn '[LogCourierServer] Transport ' + @options[:transport] + ' is listening on ephemeral port ' + @port.to_s
+          @logger.warn '[LogCourierServer] Transport ' + @options[:transport] + ' is listening on ephemeral port ' + @port.to_s unless @logger.nil?
         end
       rescue => e
         raise "[LogCourierServer] Failed to initialise: #{e}"
@@ -139,6 +139,11 @@ module LogCourier
     rescue ShutdownSignal
       # Capture shutting down signal
       0
+    rescue StandardError, NativeException => e
+      # Some other unknown problem
+      @logger.warn("[LogCourierServer] Unknown error: #{e}") unless @logger.nil?
+      @logger.warn("[LogCourierServer] #{e.backtrace}: #{e.message} (#{e.class})") unless @logger.nil?
+      raise e
     ensure
       # Raise shutdown in all client threads and join then
       client_threads.each do |_, thr|

data/lib/log-courier/server_zmq.rb

@@ -79,18 +79,20 @@ module LogCourier
         @poller = ZMQ::Poller.new
 
         if @options[:port] == 0
-          @logger.warn '[LogCourierServer] Transport ' + @options[:transport] + ' is listening on ephemeral port ' + @port.to_s
+          @logger.warn '[LogCourierServer] Transport ' + @options[:transport] + ' is listening on ephemeral port ' + @port.to_s unless @logger.nil?
         end
       rescue => e
         raise "[LogCourierServer] Failed to initialise: #{e}"
       end
 
-      @logger.info "[LogCourierServer] libzmq version #{libversion}"
-      @logger.info "[LogCourierServer] ffi-rzmq-core version #{LibZMQ::VERSION}"
-      @logger.info "[LogCourierServer] ffi-rzmq version #{ZMQ.version}"
+      @logger.info "[LogCourierServer] libzmq version #{libversion}" unless @logger.nil?
+      @logger.info "[LogCourierServer] ffi-rzmq-core version #{LibZMQ::VERSION}" unless @logger.nil?
+      @logger.info "[LogCourierServer] ffi-rzmq version #{ZMQ.version}" unless @logger.nil?
 
       # TODO: Implement workers option by receiving on a ROUTER and proxying to a DEALER, with workers connecting to the DEALER
 
+      @return_route = []
+
       reset_timeout
     end
 
@@ -108,6 +110,7 @@ module LogCourier
         begin
           begin
             # Try to receive a message
+            reset_timeout
             data = []
             rc = @socket.recv_strings(data, ZMQ::DONTWAIT)
             unless ZMQ::Util.resultcode_ok?(rc)
@@ -117,7 +120,8 @@ module LogCourier
               @poller.deregister @socket, ZMQ::POLLIN | ZMQ::POLLOUT
               @poller.register @socket, ZMQ::POLLIN
               while @poller.poll(1_000) == 0
-                raise TimeoutError if Time.now.to_i >= @timeout
+                # Using this inner while triggers pollThreadEvents in JRuby which checks for Thread.raise immediately
+                raise TimeoutError while Time.now.to_i >= @timeout
               end
               next
             end
@@ -126,21 +130,31 @@ module LogCourier
             next
           end
 
-          # Pre-send the routing information and remove it from data
-          data.delete_if do |msg|
-            reset_timeout
-            send_with_poll msg, true
-            if ZMQ::Util.errno != ZMQ::EAGAIN
-              @logger.warn "[LogCourierServer] Message send failed: #{ZMQ::Util.error_string}" unless @logger.nil?
-              raise TimeoutError
-            end
-            break if msg == ""
-            true
+          # Save the routing information that appears before the null messages
+          @return_route = []
+          @return_route.push data.shift until data.length == 0 || data[0] == ''
+
+          if data.length == 0
+            @logger.warn '[LogCourierServer] Invalid message: no data' unless @logger.nil?
+            next
+          elsif data.length == 1
+            @logger.warn '[LogCourierServer] Invalid message: empty data' unless @logger.nil?
+            next
           end
+
+          # Drop the null message separator
           data.shift
 
           if data.length != 1
-            @logger.warn '[LogCourierServer] Invalid message: multipart unexpected' unless @logger.nil?
+            @logger.warn "[LogCourierServer] Invalid message: multipart unexpected (#{data.length})" unless @logger.nil?
+            if !@logger.nil? && @logger.debug?
+              i = 0
+              data.each do |msg|
+                i += 1
+                part = msg[0..31].gsub(/[^[:print:]]/, '.')
+                @logger.debug "[LogCourierServer] Part #{i}: #{part.length}:[#{part}]"
+              end
+            end
           else
             recv(data.first, &block)
           end
@@ -155,10 +169,11 @@ module LogCourier
     rescue ShutdownSignal
       # Shutting down
       @logger.warn('[LogCourierServer] Server shutting down') unless @logger.nil?
-    rescue => e
+    rescue StandardError, NativeException => e
       # Some other unknown problem
       @logger.warn("[LogCourierServer] Unknown error: #{e}") unless @logger.nil?
       @logger.warn("[LogCourierServer] #{e.backtrace}: #{e.message} (#{e.class})") unless @logger.nil?
+      raise e
     ensure
       @socket.close
       @context.terminate
@@ -187,8 +202,14 @@ module LogCourier
     end
 
     def send(signature, message)
-      reset_timeout
       data = signature + [message.length].pack('N') + message
+
+      # Send the return route and then the message
+      reset_timeout
+      @return_route.each do |msg|
+        send_with_poll msg, true
+      end
+      send_with_poll '', true
       send_with_poll data
     end
 
@@ -206,12 +227,13 @@ module LogCourier
         @poller.deregister @socket, ZMQ::POLLIN | ZMQ::POLLOUT
         @poller.register @socket, ZMQ::POLLOUT
         while @poller.poll(1_000) == 0
-          raise TimeoutError if Time.now.to_i >= @timeout
+          # Using this inner while triggers pollThreadEvents in JRuby which checks for Thread.raise immediately
+          raise TimeoutError while Time.now.to_i >= @timeout
         end
       end
     end
 
-    def reset_timeout()
+    def reset_timeout
       # TODO: Make configurable?
       @timeout = Time.now.to_i + 1_800
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: log-courier
 version: !ruby/object:Gem::Version
-  version: 1.0.21.ga82ca4c
+  version: '1.1'
 platform: ruby
 authors:
 - Jason Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
@@ -66,9 +66,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: nowarning
 rubygems_version: 2.4.2