log-courier 1.6.pre.40.g3efb33c → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d3903076cfa365c6fc3b3732c4990d84b7dcb13
-  data.tar.gz: 391ef46aae7fa0d1da6719a8fa6913b61fa4d6e9
+  metadata.gz: 813517c74af76579fc2d9b1f036f4bc603a3659d
+  data.tar.gz: 720e7e6ccb21d339ef1dfed8959d7322bfb11b1d
 SHA512:
-  metadata.gz: db9e733ccac3f49b2a16658ebe60783e1249831f1bfb3225520ac6d325e6a99e4aa33c419276cb27ceb4598720bbf7caea8b65eb5a9f56d7fc35386d8655c6ab
-  data.tar.gz: a1be65639cbd57b7c0c1e503d122d1498bcb70c90cb015b9e74cbf7a6d756932c2019e2b381977711c8840f5f5fff30d508f8c57cd8b6c5984ac4f5dc7cd4254
+  metadata.gz: 5f43f87cdc3652b8976cd6ac6770db9c3ca32a44f19650526b5e541d530ef381d89954bfb7730d011c3c7871f398cf23e7c9e2cc63f820373ad896cecff098e6
+  data.tar.gz: 0a281f7bacbbb72f95600fbf8419c093073dfadae36814e08536edfc377d6c57eb7848f0629db3b548012b020912b1af8c72885b7b0e5445295c0a6f7aca017b

data/lib/log-courier/client.rb

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

data/lib/log-courier/event_queue.rb

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

data/lib/log-courier/server.rb

@@ -191,7 +191,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: log-courier
 version: !ruby/object:Gem::Version
-  version: 1.6.pre.40.g3efb33c
+  version: '1.6'
 platform: ruby
 authors:
 - Jason Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin
@@ -81,9 +81,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