log-courier 1.7 → 1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87c60888250cf6ee377f74118e6a3c0fecc21146
-  data.tar.gz: bfdebc1639702ab97613b840a1e28c4b41b3cb6f
+  metadata.gz: 4a5972c2f6899a0d26511058691ed121394b6291
+  data.tar.gz: 53f55e097ba17fc459287af1665def25abee39df
 SHA512:
-  metadata.gz: fae7a9880faa41b0ceb6af7ce7cf79011b23327b5cc5277434cebce4238fcaaede498dbcc061017d3f4439dc2f1cb2be36a74939992d81645799f1a41e5f2b6b
-  data.tar.gz: d5978e30451e8d96ef5bec62844e591195b24fbdc9d31902402408723bb18d575ec53dac4c84a6de62fa067f00704ea526a836ff37dbb6002cbf483dca9637b3
+  metadata.gz: 9c9a0a52422e2604018625abb2b5af6b47ffcce01d9e5288b99fae0c077da13a45890af868a99347ea98f596abcbe8d1cdfd3622cc82914150093a858e13cc50
+  data.tar.gz: 20ba9debdee92a7375bfc92a7863a93e3836b1a1013948088d50315cfdf8e1158e6976a9793f44e8600d674c4fa7a2a56bb9d2eada680b1d6ed658ca0f9bb39b

data/lib/log-courier/client.rb

@@ -31,11 +31,21 @@ module LogCourier
 
   # Describes a pending payload
   class PendingPayload
+    # TODO(driskell): Consolidate singleton into another file
     class << self
       @json_adapter
+      @json_parseerror
+
       def get_json_adapter
         @json_adapter = MultiJson.adapter.instance if @json_adapter.nil?
-        return @json_adapter
+        @json_adapter
+      end
+
+      def get_json_parseerror
+        if @json_parseerror.nil?
+          @json_parseerror = get_json_adapter.class::ParseError
+        end
+        @json_parseerror
       end
     end
 
@@ -66,7 +76,7 @@ module LogCourier
       end
 
       # Generate and store the payload
-      @payload = nonce + buffer.flush(Zlib::FINISH)
+      @payload = nonce + buffer.finish()
       @last_sequence = 0
       @sequence_len = @events.length
     end

data/lib/log-courier/client_tcp.rb

@@ -68,12 +68,20 @@ module LogCourier
         begin
           run_send io_control
         rescue ShutdownSignal
+        rescue StandardError, NativeException => e
+          @logger.warn e, :hint => 'Unknown write error' unless @logger.nil?
+          io_control << ['F']
+          return
         end
       end
       @recv_thread = Thread.new do
         begin
           run_recv io_control
         rescue ShutdownSignal
+        rescue StandardError, NativeException => e
+          @logger.warn e, :hint => 'Unknown read error' unless @logger.nil?
+          io_control << ['F']
+          return
         end
       end
       return
@@ -151,12 +159,6 @@ module LogCourier
       @logger.warn 'Write error', :error => e.message unless @logger.nil?
       io_control << ['F']
       return
-    rescue ShutdownSignal
-      raise
-    rescue StandardError, NativeException => e
-      @logger.warn e, :hint => 'Unknown write error' unless @logger.nil?
-      io_control << ['F']
-      return
     end
 
     def run_recv(io_control)
@@ -194,12 +196,6 @@ module LogCourier
       @logger.warn 'Connection closed by server' unless @logger.nil?
       io_control << ['F']
       return
-    rescue ShutdownSignal
-      raise
-    rescue StandardError, NativeException => e
-      @logger.warn e, :hint => 'Unknown read error' unless @logger.nil?
-      io_control << ['F']
-      return
     end
 
     def tls_connect
@@ -234,7 +230,7 @@ module LogCourier
           ssl.cert_store = cert_store
           ssl.verify_mode = OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
 
-          @ssl_client = OpenSSL::SSL::SSLSocket.new(tcp_socket)
+          @ssl_client = OpenSSL::SSL::SSLSocket.new(tcp_socket, ssl)
 
           socket = @ssl_client.connect
 

data/lib/log-courier/server.rb

@@ -33,6 +33,24 @@ module LogCourier
   class Server
     attr_reader :port
 
+    # TODO(driskell): Consolidate singleton into another file
+    class << self
+      @json_adapter
+      @json_parseerror
+
+      def get_json_adapter
+        @json_adapter = MultiJson.adapter.instance if @json_adapter.nil?
+        @json_adapter
+      end
+
+      def get_json_parseerror
+        if @json_parseerror.nil?
+          @json_parseerror = get_json_adapter.class::ParseError
+        end
+        @json_parseerror
+      end
+    end
+
     def initialize(options = {})
       @options = {
         logger:    nil,
@@ -54,10 +72,6 @@ module LogCourier
 
       # Grab the port back and update the logger context
       @port = @server.port
-
-      # Load the json adapter
-      @json_adapter = MultiJson.adapter.instance
-      @json_options = { raw: true }
     end
 
     def run(&block)
@@ -165,17 +179,23 @@ module LogCourier
         data_buf.force_encoding('utf-8')
 
         # Ensure valid encoding
+        invalid_encodings = 0
         unless data_buf.valid_encoding?
           data_buf.chars.map do |c|
-            c.valid_encoding? ? c : "\xEF\xBF\xBD"
+            if c.valid_encoding?
+              c
+            else
+              invalid_encodings += 1
+              "\xEF\xBF\xBD"
+            end
           end
         end
 
         # Decode the JSON
         begin
-          event = @json_adapter.load(data_buf, @json_options)
-        rescue MultiJson::ParseError => e
-          @logger.warn e, :hint => 'JSON parse failure, falling back to plain-text' unless @logger.nil?
+          event = self.class.get_json_adapter.load(data_buf, :raw => true)
+        rescue self.class.get_json_parseerror => e
+          @logger.warn e, :invalid_encodings => invalid_encodings, :hint => 'JSON parse failure, falling back to plain-text' unless @logger.nil?
           event = { 'message' => data_buf }
         end
 

data/lib/log-courier/server_tcp.rb

@@ -188,19 +188,25 @@ module LogCourier
     private
 
     def run_thread(client, peer, &block)
-      # Perform the handshake inside the new thread so we don't block TCP accept
-      if @options[:transport] == 'tls'
-        begin
-          client.accept
-        rescue EOFError, OpenSSL::SSL::SSLError, IOError => e
-          # Handshake failure or other issue
-          @logger.warn 'Connection failed to initialise', :error => e.message, :peer => peer unless @logger.nil?
-          client.close
-          return
+      begin
+        # Perform the handshake inside the new thread so we don't block TCP accept
+        if @options[:transport] == 'tls'
+          begin
+            client.accept
+          rescue EOFError, OpenSSL::SSL::SSLError, IOError => e
+            # Handshake failure or other issue
+            @logger.warn 'Connection failed to initialise', :error => e.message, :peer => peer unless @logger.nil?
+            client.close
+            return
+          end
         end
-      end
 
-      ConnectionTcp.new(@logger, client, peer, @options).run(&block)
+        ConnectionTcp.new(@logger, client, peer, @options).run(&block)
+      rescue ShutdownSignal
+        # Shutting down
+        @logger.info 'Server shutting down, connection closed', :peer => peer unless @logger.nil?
+        return
+      end
     end
   end
 
@@ -228,7 +234,19 @@ module LogCourier
       event.merge! @peer_fields if @peer_fields.length != 0
     end
 
-    def run
+    def run(&block)
+      process_messages &block
+    rescue ShutdownSignal
+      # Shutting down
+      @logger.info 'Server shutting down, closing connection', :peer => @peer unless @logger.nil?
+      return
+    rescue StandardError, NativeException => e
+      # Some other unknown problem
+      @logger.warn e, :hint => 'Unknown error, connection aborted', :peer => @peer unless @logger.nil?
+      return
+    end
+
+    def process_messages
       loop do
         # Read messages
         # Each message begins with a header
@@ -258,7 +276,6 @@ module LogCourier
         # If we EOF next it's a graceful close
         @in_progress = false
       end
-      return
     rescue TimeoutError
       # Timeout of the connection, we were idle too long without a ping/pong
       @logger.warn 'Connection timed out', :peer => @peer unless @logger.nil?
@@ -282,14 +299,6 @@ module LogCourier
       # Connection abort request due to a protocol error
       @logger.warn 'Protocol error, connection aborted', :error => e.message, :peer => @peer unless @logger.nil?
       return
-    rescue ShutdownSignal
-      # Shutting down
-      @logger.info 'Server shutting down, closing connection', :peer => @peer unless @logger.nil?
-      return
-    rescue StandardError, NativeException => e
-      # Some other unknown problem
-      @logger.warn e, :hint => 'Unknown error, connection aborted', :peer => @peer unless @logger.nil?
-      return
     ensure
       @fd.close rescue nil
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: log-courier
 version: !ruby/object:Gem::Version
-  version: '1.7'
+  version: '1.8'
 platform: ruby
 authors:
 - Jason Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin