log-courier 1.6 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 813517c74af76579fc2d9b1f036f4bc603a3659d
-  data.tar.gz: 720e7e6ccb21d339ef1dfed8959d7322bfb11b1d
+  metadata.gz: 87c60888250cf6ee377f74118e6a3c0fecc21146
+  data.tar.gz: bfdebc1639702ab97613b840a1e28c4b41b3cb6f
 SHA512:
-  metadata.gz: 5f43f87cdc3652b8976cd6ac6770db9c3ca32a44f19650526b5e541d530ef381d89954bfb7730d011c3c7871f398cf23e7c9e2cc63f820373ad896cecff098e6
-  data.tar.gz: 0a281f7bacbbb72f95600fbf8419c093073dfadae36814e08536edfc377d6c57eb7848f0629db3b548012b020912b1af8c72885b7b0e5445295c0a6f7aca017b
+  metadata.gz: fae7a9880faa41b0ceb6af7ce7cf79011b23327b5cc5277434cebce4238fcaaede498dbcc061017d3f4439dc2f1cb2be36a74939992d81645799f1a41e5f2b6b
+  data.tar.gz: d5978e30451e8d96ef5bec62844e591195b24fbdc9d31902402408723bb18d575ec53dac4c84a6de62fa067f00704ea526a836ff37dbb6002cbf483dca9637b3

data/lib/log-courier/client.rb

@@ -103,7 +103,6 @@ module LogCourier
       }.merge!(options)
 
       @logger = @options[:logger]
-      @logger['plugin'] = 'output/courier' unless @logger.nil?
 
       case @options[:transport]
       when 'tcp', 'tls'
@@ -440,7 +439,7 @@ module LogCourier
       fail ProtocolError, "ACKN message size invalid (#{message.length})" if message.length != 20
 
       # Grab nonce
-      nonce, sequence = message.unpack('A16N')
+      nonce, sequence = message.unpack('a16N')
 
       if !@logger.nil? && @logger.debug?
         nonce_str = nonce.each_byte.map do |b|

data/lib/log-courier/client_tcp.rb

@@ -65,10 +65,16 @@ module LogCourier
       @send_paused = false
 
       @send_thread = Thread.new do
-        run_send io_control
+        begin
+          run_send io_control
+        rescue ShutdownSignal
+        end
       end
       @recv_thread = Thread.new do
-        run_recv io_control
+        begin
+          run_recv io_control
+        rescue ShutdownSignal
+        end
       end
       return
     end
@@ -146,7 +152,7 @@ module LogCourier
       io_control << ['F']
       return
     rescue ShutdownSignal
-      return
+      raise
     rescue StandardError, NativeException => e
       @logger.warn e, :hint => 'Unknown write error' unless @logger.nil?
       io_control << ['F']
@@ -189,8 +195,8 @@ module LogCourier
       io_control << ['F']
       return
     rescue ShutdownSignal
-      return
-    rescue => e
+      raise
+    rescue StandardError, NativeException => e
       @logger.warn e, :hint => 'Unknown read error' unless @logger.nil?
       io_control << ['F']
       return

data/lib/log-courier/event_queue.rb

@@ -135,14 +135,18 @@ module LogCourier
     # Returns +true+ if the queue is empty.
     #
     def empty?
-      @que.empty?
+      @mutex.synchronize do
+        return @que.empty?
+      end
     end
 
     #
     # Removes all objects from the queue.
     #
     def clear
-      @que.clear
+      @mutex.synchronize do
+        @que.clear
+      end
       self
     end
 
@@ -150,7 +154,9 @@ module LogCourier
     # Returns the length of the queue.
     #
     def length
-      @que.length
+      @mutex.synchronize do
+        return @que.length
+      end
     end
 
     #
@@ -162,7 +168,9 @@ module LogCourier
     # Returns the number of threads waiting on the queue.
     #
     def num_waiting
-      @num_waiting + @num_enqueue_waiting
+      @mutex.synchronize do
+        return @num_waiting + @num_enqueue_waiting
+      end
     end
 
     private

data/lib/log-courier/server.rb

@@ -40,7 +40,6 @@ module LogCourier
       }.merge!(options)
 
       @logger = @options[:logger]
-      @logger['plugin'] = 'input/courier' unless @logger.nil?
 
       case @options[:transport]
       when 'tcp', 'tls'
@@ -55,7 +54,6 @@ module LogCourier
 
       # Grab the port back and update the logger context
       @port = @server.port
-      @logger['port'] = @port unless @logger.nil?
 
       # Load the json adapter
       @json_adapter = MultiJson.adapter.instance
@@ -191,7 +189,7 @@ module LogCourier
           # Full pipeline, partial ack
           # NOTE: comm.send can raise a Timeout::Error of its own
           @logger.debug 'Partially acknowledging message', :nonce => nonce_str.join, :sequence => sequence if !@logger.nil? && @logger.debug?
-          comm.send 'ACKN', [nonce, sequence].pack('A*N')
+          comm.send 'ACKN', [nonce, sequence].pack('a*N')
           ack_timeout = Time.now.to_i + 5
           retry
         end

data/lib/log-courier/server_tcp.rb

@@ -34,7 +34,13 @@ module LogCourier
     # Save the peer
     def accept
       sock = super
-      peer = sock.peeraddr(:numeric)
+      # Prevent reverse lookup by passing false
+      begin
+        peer = sock.peeraddr(false)
+      rescue ArgumentError
+        # Logstash <= 1.5.0 has a patch that blocks parameters (elastic/logstash#3364)
+        peer = sock.peeraddr
+      end
       @peer = "#{peer[2]}:#{peer[1]}"
       return sock
     end

metadata

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