log-courier 2.9.1 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbafa32351f4513cd8863a25bfbeeca97497d2b148f2350baf598f595205dffe
-  data.tar.gz: dddd5573b4d3908e0028652598ace3948bb0c516b2844c2d670940ad16f470cf
+  metadata.gz: 834c4c36961276190be8487bf5b1886a26929a7edc66d5e7bec33ebed66423bf
+  data.tar.gz: 4252b6972eb41c1f3dc1fc4a5e3d3d801bb14022bf624f5b0ff6a221a8b05fcc
 SHA512:
-  metadata.gz: 8ffa4c359125610432621adb716a6e25ef5c510436ff5a4d3501423815c8a5dbcf7873e4351fe30465110de37f422118f08dbd85d462f60829f4cbdcd3b5d33e
-  data.tar.gz: b10e56daebac839e8f320cd947ac04785154ec493e48efaa0228752412cb4e0728f75159a863fe4dbcc251dca9c8e2c7bf43e6755bb45b14436aad9b83bbcaa2
+  metadata.gz: ff6bb4da32cc74999598c04a2da316e3441bdf001977312bb51ee3396a0ed28fe1b4f675819eb488a594cdd27a7be6a810d2337424477874c8024c6aa7241986
+  data.tar.gz: a807517a2d0eab92b00a27372ce4c86b3d5362b4a8ac3682a213a5bcff08a5aa81f993309a264c5aae176cd1e079f4a8264a6f4564765420d2b20eda60ea2881

data/lib/log-courier/event_queue.rb

@@ -142,6 +142,7 @@ module LogCourier
     def clear
       @mutex.synchronize do
         @que.clear
+        @enque_cond.signal if @que.length < @max
       end
       self
     end

data/lib/log-courier/server.rb

@@ -51,53 +51,46 @@ module LogCourier
 
       # Grab the port back and update the logger context
       @port = @server.port
-    end
 
-    def run(&block)
       # TODO: Make queue size configurable
       @event_queue = EventQueue.new 1
-      server_thread = nil
-
-      begin
-        server_thread = Thread.new do
-          # Receive messages and process them
-          @server.run do |signature, message, comm|
-            case signature
-            when 'PING'
-              process_ping message, comm
-            when 'JDAT'
-              process_jdat message, comm, @event_queue
+
+      @server_thread = Thread.new do
+        # Receive messages and process them
+        @server.run do |signature, message, comm|
+          case signature
+          when 'PING'
+            process_ping message, comm
+          when 'JDAT'
+            process_jdat message, comm, @event_queue
+          else
+            if comm.peer.nil?
+              @logger&.warn 'Unknown message received', from: 'unknown'
             else
-              if comm.peer.nil?
-                @logger&.warn 'Unknown message received', from: 'unknown'
-              else
-                @logger&.warn 'Unknown message received', from: comm.peer
-              end
-              # Don't kill a client that sends a bad message
-              # Just reject it and let it send it again, potentially to another server
-              comm.send '????', ''
+              @logger&.warn 'Unknown message received', from: comm.peer
             end
+            # Don't kill a client that sends a bad message
+            # Just reject it and let it send it again, potentially to another server
+            comm.send '????', ''
           end
         end
+      end
+    end
 
-        loop do
-          event = @event_queue.pop
-          break if event.nil?
+    def run(&block)
+      loop do
+        event = @event_queue.pop
+        break if event.nil?
 
-          block.call event
-        end
-      ensure
-        # Signal the server thread to stop
-        unless server_thread.nil?
-          server_thread.raise ShutdownSignal
-          server_thread.join
-        end
+        block.call event
       end
       nil
     end
 
     def stop
+      @server_thread.raise ShutdownSignal
       @event_queue << nil
+      @server_thread.join
       nil
     end
 

data/lib/log-courier/server_tcp.rb

@@ -283,10 +283,10 @@ module LogCourier
       # Connection abort request due to a protocol error
       @logger&.warn 'Protocol error, connection aborted', error: e.message, peer: @peer
       nil
-    rescue ShutdownSignal
+    rescue ShutdownSignal => e
       # Shutting down
       @logger&.info 'Server shutting down, closing connection', peer: @peer
-      nil
+      raise e
     rescue StandardError => e
       # Some other unknown problem
       @logger&.warn e.message, hint: 'Unknown error, connection aborted', peer: @peer

data/lib/log-courier/version.rb

@@ -1,7 +1,7 @@
 # Version of LogCourier
 module LogCourier
   MAJOR_VERSION = 2
-  MINOR_VERSION = 9
-  PATCH_VERSION = 1
-  VERSION = '2.9.1'.freeze
+  MINOR_VERSION = 10
+  PATCH_VERSION = 0
+  VERSION = '2.10.0'.freeze
 end

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: log-courier
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.10.0
 platform: ruby
 authors:
 - Jason Woods
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-15 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: cabin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+  name: cabin
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,12 +25,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+  name: multi_json
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Ruby implementation of the Courier protocol