log-courier 2.7.3 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aa4bc695758102c35a9bc74cb856ec456b92715cb6f133592bfdeaa0a8a6a30
-  data.tar.gz: c5f67b639fca236f884f01f3054dc6e4b3292826051f1696cff324f80e6878ec
+  metadata.gz: 834c4c36961276190be8487bf5b1886a26929a7edc66d5e7bec33ebed66423bf
+  data.tar.gz: 4252b6972eb41c1f3dc1fc4a5e3d3d801bb14022bf624f5b0ff6a221a8b05fcc
 SHA512:
-  metadata.gz: e0826718c6e075b731d04f7f8c825aa0fd59b9d0045b58183009f42516e1f1a7b8465cd72af7d04603d8946e3240acba91101fe41cdb6bcc609856a8b50d171d
-  data.tar.gz: 372bbefcfd75d6de6139fc6b0d1901a77cb77609c104fe897d156b29c83edca6994abb9bf8a44a718d963e0b20a3127fe8d91615f0ae4aaff05cea1de31bbbf8
+  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/rspec/spec_helper.rb

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 require 'cabin'
+require 'fileutils'
 require 'log-courier/client'
 require 'log-courier/server'
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: log-courier
 version: !ruby/object:Gem::Version
-  version: 2.7.3
+  version: 2.10.0
 platform: ruby
 authors:
 - Jason Woods
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,7 @@ files:
 - lib/log-courier/rspec/spec_helper.rb
 - lib/log-courier/server.rb
 - lib/log-courier/server_tcp.rb
+- lib/log-courier/version.rb
 homepage: https://github.com/driskell/log-courier
 licenses:
 - Apache-2.0
@@ -71,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Ruby implementation of the Courier protocol