serverengine 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b802588a6e93b69c2dc9810ab33b9e3195e14d93c5f977961a04cc6d88cacf1
-  data.tar.gz: 9921383ec5ae39cfe982da9ce8c0b432bbc553c2ea5d2090a2d849ec2500c230
+  metadata.gz: 516efcdedbeba3c7d7988c91cc121a37b52efca99726d833447fe374680cac43
+  data.tar.gz: b4265b4b425eb2d165881d579f6b2115c8e7bf2298c56f1cf75d6ed1cb804993
 SHA512:
-  metadata.gz: ea4c0e4b34490665e4287c0f43e4ea1f32c10fe022464a69326505ec21aad2650e53b842c2aaeec2a969d914f73715ee059b2bdbb3d72d14b0bce51192bf217c
-  data.tar.gz: 3e30810b08b8667f2295b41fca60c4683126d8936e32169d0789b8ec02ba3965fc631dbe069c9a8cf057e109ccaa9ad3ad14f4507b2388dcd9ae27463ce39651
+  metadata.gz: cc1d3263b08bd87e645563000b46a79a58437617006eb993b959d50105a875d1592bdce2e45c9bd1a4fbfd7740ab672d1e61a13e39654cdae798dbe0fe18f606
+  data.tar.gz: 62fca1438f15432ce570216dce14eabef6235835c2f43f875ba220b3ba6d6a86e8aaedcfa4e5752a7ba5529a55d6bfeca9618ce0f59924dd6ef9666e69d00cf2

data/.github/workflows/{linux.yml → test.yml}

@@ -1,4 +1,4 @@
-name: Testing on Ubuntu
+name: Test
 on:
   push:
     branches: [master]
@@ -11,10 +11,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.1', '3.0', '2.7' ]
-        os:
-          - ubuntu-latest
-    name: Unit testing with Ruby ${{ matrix.ruby }} on ${{ matrix.os }}
+        ruby: [ '3.3', '3.2', '3.1', '3.0', '2.7' ]
+        os: ['ubuntu-latest', 'windows-latest']
+    name: Ruby ${{ matrix.ruby }} on ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby
@@ -22,9 +21,7 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
       - name: Install dependencies
-        run: |
-          gem install bundler rake
-          bundle install --jobs 4 --retry 3
+        run: bundle install --jobs 4 --retry 3
       - name: Run tests
         env:
           CI: true

data/Changelog

@@ -1,3 +1,14 @@
+2024-10-22 version 2.4.0
+
+* Add missing base64 and logger gem as dependency for Ruby 3.4 and 3.5.
+* socket_manager: add feature to share sockets with another server.
+
+2023-03-14 version 2.3.2
+
+* Accept `nil` for `ServerEngine::SocketManager::Server.open` to select path automatically
+* Care excluded port ranges of Windows in `ServerEngine::SocketManager.generate_path`
+* Update to Rake 13 and RSpec 3 to support running tests on Ruby 3.2
+
 2022-12-22 version 2.3.1
 
 * Don't treat as error when worker shuts down with exit status 0

data/README.md

@@ -370,8 +370,8 @@ se.run
 ```ruby
 module MyServer
   def before_run
-    @socket_manager_path = ServerEngine::SocketManager::Server.generate_path
-    @socket_manager_server = ServerEngine::SocketManager::Server.open(@socket_manager_path)
+    @socket_manager_server = ServerEngine::SocketManager::Server.open
+    @socket_manager_path = @socket_manager_server.path
   end
 
   def after_run
@@ -413,8 +413,15 @@ se = ServerEngine.create(MyServer, MyWorker, {
 se.run
 ```
 
-See also [examples](https://github.com/fluent/serverengine/tree/master/examples).
+Other features:
+
+- `socket_manager_server = SocketManager::Server.share_sockets_with_another_server(path)`
+  - It starts a new manager server that shares all UDP/TCP sockets with the existing manager.
+  - We can use this for live restart for network servers.
+  - The old process should stop without removing the file for the socket after the new process starts.
+  - Limitation: This feature would not work well if the process opens new TCP ports frequently.
 
+See also [examples](https://github.com/fluent/serverengine/tree/master/examples).
 
 ## Module API
 

data/examples/server.rb

@@ -41,8 +41,8 @@ module MyServer
   attr_reader :socket_manager_path
 
   def before_run
-    @socket_manager_path = ServerEngine::SocketManager::Server.generate_path
-    @socket_manager_server = ServerEngine::SocketManager::Server.open(@socket_manager_path)
+    @socket_manager_server = ServerEngine::SocketManager::Server.open
+    @socket_manager_path = @socket_manager_server.path
   rescue Exception => e
     logger.error "unexpected error in server, class #{e.class}: #{e.message}"
     raise

data/lib/serverengine/socket_manager.rb

@@ -77,34 +77,51 @@ module ServerEngine
           port = ENV['SERVERENGINE_SOCKETMANAGER_PORT']
           return port.to_i if port
 
-          for port in get_dynamic_port_range
-            if `netstat -na | findstr "#{port}"`.length == 0
-              return port
-            end
-          end
+          excluded_port_ranges = get_excluded_port_ranges
+          get_dynamic_port_range
+            .reject { |port| excluded_port_ranges.any? { |range| range.cover?(port) } }
+            .find { |port| `netstat -na | findstr "#{port}"`.length == 0 }
         else
           base_dir = (ENV['SERVERENGINE_SOCKETMANAGER_SOCK_DIR'] || '/tmp')
           File.join(base_dir, 'SERVERENGINE_SOCKETMANAGER_' + Time.now.utc.iso8601 + '_' + Process.pid.to_s)
         end
       end
 
-      def self.open(path)
-        new(path)
+      def self.open(path = nil)
+        return new(path) unless path.nil?
+        if ServerEngine.windows?
+          new(0)
+        else
+          new(self.generate_path)
+        end
+      end
+
+      def self.share_sockets_with_another_server(path)
+        raise NotImplementedError, "Not supported on Windows." if ServerEngine.windows?
+        server = new(path, start: false)
+        server.share_sockets_with_another_server
+        server
       end
 
-      def initialize(path)
+      def initialize(path, start: true)
         @tcp_sockets = {}
         @udp_sockets = {}
         @mutex = Mutex.new
-        @path = start_server(path)
+        @path = start ? start_server(path) : path
       end
 
       attr_reader :path
+      attr_reader :tcp_sockets, :udp_sockets # for tests
 
       def new_client
         Client.new(@path)
       end
 
+      def start
+        start_server(path)
+        nil
+      end
+
       def close
         stop_server
         nil
@@ -155,9 +172,9 @@ module ServerEngine
           res = SocketManager.recv_peer(peer)
           return if res.nil?
 
-          pid, method, bind, port = *res
+          pid, method, *opts = res
           begin
-            send_socket(peer, pid, method, bind, port)
+            send_socket(peer, pid, method, *opts)
           rescue => e
             SocketManager.send_peer(peer, e)
           end
@@ -198,6 +215,27 @@ module ServerEngine
             return 49152..65535
           end
         end
+
+        def self.get_excluded_port_ranges
+          # Example output of netsh:
+          #
+          # Protocol tcp Port Exclusion Ranges
+          #
+          # Start Port    End Port
+          # ----------    --------
+          #       2869        2869
+          #      49152       49251
+          #      50000       50059     *
+          #      57095       57194
+          #
+          # * - Administered port exclusions.
+          #
+          `netsh int ipv4 show excludedportrange tcp`
+            .force_encoding("ASCII-8BIT")
+            .lines
+            .map { |line| line.match(/\s*(\d+)\s*(\d+)[\s\*]*/) ? $1.to_i..$2.to_i : nil }
+            .compact
+        end
       end
     end
 

data/lib/serverengine/socket_manager_unix.rb

@@ -47,6 +47,38 @@ module ServerEngine
     end
 
     module ServerModule
+      def share_sockets_with_another_server
+        another_server = UNIXSocket.new(@path)
+        begin
+          idx = 0
+          while true
+            SocketManager.send_peer(another_server, [Process.pid, :share_udp, idx])
+            key = SocketManager.recv_peer(another_server)
+            break if key.nil?
+            @udp_sockets[key] = another_server.recv_io UDPSocket
+            idx += 1
+          end
+
+          idx = 0
+          while true
+            SocketManager.send_peer(another_server, [Process.pid, :share_tcp, idx])
+            key = SocketManager.recv_peer(another_server)
+            break if key.nil?
+            @tcp_sockets[key] = another_server.recv_io TCPServer
+            idx += 1
+          end
+
+          SocketManager.send_peer(another_server, [Process.pid, :share_unix])
+          res = SocketManager.recv_peer(another_server)
+          raise res if res.is_a?(Exception)
+          @server = another_server.recv_io UNIXServer
+
+          start_server(@path)
+        ensure
+          another_server.close
+        end
+      end
+
       private
 
       def listen_tcp_new(bind_ip, port)
@@ -77,15 +109,17 @@ module ServerEngine
       end
 
       def start_server(path)
-        # return absolute path so that client can connect to this path
-        # when client changed working directory
-        path = File.expand_path(path)
+        unless @server
+          # return absolute path so that client can connect to this path
+          # when client changed working directory
+          path = File.expand_path(path)
 
-        begin
-          old_umask = File.umask(0077) # Protect unix socket from other users
-          @server = UNIXServer.new(path)
-        ensure
-          File.umask(old_umask)
+          begin
+            old_umask = File.umask(0077) # Protect unix socket from other users
+            @server = UNIXServer.new(path)
+          ensure
+            File.umask(old_umask)
+          end
         end
 
         @thread = Thread.new do
@@ -111,19 +145,34 @@ module ServerEngine
         @thread.join if RUBY_VERSION >= "2.2"
       end
 
-      def send_socket(peer, pid, method, bind, port)
-        sock = case method
-               when :listen_tcp
-                 listen_tcp(bind, port)
-               when :listen_udp
-                 listen_udp(bind, port)
-               else
-                 raise ArgumentError, "Unknown method: #{method.inspect}"
-               end
-
-        SocketManager.send_peer(peer, nil)
-
-        peer.send_io sock
+      def send_socket(peer, pid, method, *opts)
+        case method
+        when :listen_tcp
+          bind, port = opts
+          sock = listen_tcp(bind, port)
+          SocketManager.send_peer(peer, nil)
+          peer.send_io sock
+        when :listen_udp
+          bind, port = opts
+          sock = listen_udp(bind, port)
+          SocketManager.send_peer(peer, nil)
+          peer.send_io sock
+        when :share_tcp
+          idx, = opts
+          key = @tcp_sockets.keys[idx]
+          SocketManager.send_peer(peer, key)
+          peer.send_io(@tcp_sockets.values[idx]) if key
+        when :share_udp
+          idx, = opts
+          key = @udp_sockets.keys[idx]
+          SocketManager.send_peer(peer, key)
+          peer.send_io(@udp_sockets.values[idx]) if key
+        when :share_unix
+          SocketManager.send_peer(peer, nil)
+          peer.send_io @server
+        else
+          raise ArgumentError, "Unknown method: #{method.inspect}"
+        end
       end
     end
 

data/lib/serverengine/socket_manager_win.rb

@@ -108,8 +108,9 @@ module ServerEngine
       end
 
       def start_server(addr)
-        # TODO: use TCPServer, but this is risky because using not conflict path is easy,
-        # but using not conflict port is difficult. Then We had better implement using NamedPipe.
+        # We need to take care about selecting an available port.
+        # By passing `nil` or `0` as `addr`, an available port is automatically selected.
+        # However, we should consider using NamedPipe instead of TCPServer.
         @server = TCPServer.new("127.0.0.1", addr)
         @thread = Thread.new do
           begin
@@ -123,7 +124,7 @@ module ServerEngine
           end
         end
 
-        return path
+        return @server.addr[1]
       end
 
       def stop_server

data/lib/serverengine/version.rb

@@ -1,3 +1,3 @@
 module ServerEngine
-  VERSION = "2.3.1"
+  VERSION = "2.4.0"
 end

data/serverengine.gemspec

@@ -16,13 +16,15 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.1.0"
+  gem.required_ruby_version = ">= 2.3.0"
 
   gem.add_dependency "sigdump", ["~> 0.2.2"]
+  gem.add_dependency "base64", ["~> 0.1"]
+  gem.add_dependency "logger", ["~> 1.4"]
 
   # rake v12.x doesn't work with rspec 2. rspec should be updated to 3
-  gem.add_development_dependency "rake", ["~> 11.0"]
-  gem.add_development_dependency "rspec", ["~> 2.13.0"]
+  gem.add_development_dependency "rake", ["~> 13.0"]
+  gem.add_development_dependency "rspec", ["~> 3.12.0"]
 
   gem.add_development_dependency 'rake-compiler-dock', ['~> 0.5.0']
   gem.add_development_dependency 'rake-compiler', ['~> 0.9.4']

data/spec/daemon_logger_spec.rb

@@ -150,7 +150,7 @@ describe ServerEngine::DaemonLogger do
   end
 
   it 'inter-process locking on rotation' do
-    pending "fork is not implemented in Windows" if ServerEngine.windows?
+    skip "fork is not implemented in Windows" if ServerEngine.windows?
 
     log = DaemonLogger.new("tmp/se4.log", level: 'trace', log_rotate_age: 3, log_rotate_size: 10)
     r, w = IO.pipe
@@ -175,7 +175,7 @@ describe ServerEngine::DaemonLogger do
   end
 
   it 'reopen log when path is renamed' do
-    pending "rename isn't supported on windows" if ServerEngine.windows?
+    skip "rename isn't supported on windows" if ServerEngine.windows?
 
     log = DaemonLogger.new("tmp/rotate.log", { level: 'info', log_rotate_age: 0  })
 

data/spec/daemon_spec.rb

@@ -11,7 +11,7 @@ describe ServerEngine::Daemon do
   end
 
   it 'run and graceful stop by signal' do
-    pending "not supported signal base commands on Windows" if ServerEngine.windows?
+    skip "not supported signal base commands on Windows" if ServerEngine.windows?
 
     dm = Daemon.new(TestServer, TestWorker, daemonize: true, pid_path: "tmp/pid", command_sender: "signal")
     dm.main
@@ -33,7 +33,7 @@ describe ServerEngine::Daemon do
   end
 
   it 'signals' do
-    pending "not supported signal base commands on Windows" if ServerEngine.windows?
+    skip "not supported signal base commands on Windows" if ServerEngine.windows?
     dm = Daemon.new(TestServer, TestWorker, daemonize: true, pid_path: "tmp/pid", command_sender: "signal")
     dm.main
 
@@ -112,7 +112,7 @@ describe ServerEngine::Daemon do
   end
 
   it 'exits with status 0 when it was stopped normally' do
-    pending "worker type process(fork) cannot be used in Windows" if ServerEngine.windows?
+    skip "worker type process(fork) cannot be used in Windows" if ServerEngine.windows?
     dm = Daemon.new(
       TestServer,
       TestWorker,
@@ -135,7 +135,7 @@ describe ServerEngine::Daemon do
   end
 
   it 'exits with status of workers if worker exits with status specified in unrecoverable_exit_codes, without supervisor' do
-    pending "worker type process(fork) cannot be used in Windows" if ServerEngine.windows?
+    skip "worker type process(fork) cannot be used in Windows" if ServerEngine.windows?
 
     dm = Daemon.new(
       TestServer,
@@ -159,7 +159,7 @@ describe ServerEngine::Daemon do
   end
 
   it 'exits with status of workers if worker exits with status specified in unrecoverable_exit_codes, with supervisor' do
-    pending "worker type process(fork) cannot be used in Windows" if ServerEngine.windows?
+    skip "worker type process(fork) cannot be used in Windows" if ServerEngine.windows?
 
     dm = Daemon.new(
       TestServer,

data/spec/multi_process_server_spec.rb

@@ -17,7 +17,7 @@ require 'securerandom'
     end
 
     it 'scale up' do
-      pending "Windows environment does not support fork" if ServerEngine.windows? && impl_class == ServerEngine::MultiProcessServer
+      skip "Windows environment does not support fork" if ServerEngine.windows? && impl_class == ServerEngine::MultiProcessServer
 
       config = {
         workers: 2,
@@ -50,7 +50,7 @@ require 'securerandom'
     end
 
     it 'scale down' do
-      pending "Windows environment does not support fork" if ServerEngine.windows? && impl_class == ServerEngine::MultiProcessServer
+      skip "Windows environment does not support fork" if ServerEngine.windows? && impl_class == ServerEngine::MultiProcessServer
 
       config = {
         workers: 2,
@@ -98,7 +98,7 @@ end
     end
 
     it 'raises SystemExit when all workers exit with specified code by unrecoverable_exit_codes' do
-      pending "Windows environment does not support fork" if ServerEngine.windows? && impl_class == ServerEngine::MultiProcessServer
+      skip "Windows environment does not support fork" if ServerEngine.windows? && impl_class == ServerEngine::MultiProcessServer
 
       config = {
         workers: 4,
@@ -127,7 +127,7 @@ end
     end
 
     it 'raises SystemExit immediately when a worker exits if stop_immediately_at_unrecoverable_exit specified' do
-      pending "Windows environment does not support fork" if ServerEngine.windows? && impl_class == ServerEngine::MultiProcessServer
+      skip "Windows environment does not support fork" if ServerEngine.windows? && impl_class == ServerEngine::MultiProcessServer
 
       config = {
         workers: 4,
@@ -172,7 +172,7 @@ describe "log level for exited proccess" do
   end
 
   it 'stop' do
-    pending "Windows environment does not support fork" if ServerEngine.windows?
+    skip "Windows environment does not support fork" if ServerEngine.windows?
 
     config = {
       workers: 1,
@@ -197,7 +197,7 @@ describe "log level for exited proccess" do
   end
 
   it 'non zero exit status' do
-    pending "Windows environment does not support fork" if ServerEngine.windows?
+    skip "Windows environment does not support fork" if ServerEngine.windows?
 
     config = {
       workers: 1,
@@ -232,7 +232,7 @@ describe "log level for exited proccess" do
   end
 
   it 'zero exit status' do
-    pending "Windows environment does not support fork" if ServerEngine.windows?
+    skip "Windows environment does not support fork" if ServerEngine.windows?
 
     config = {
       workers: 1,

data/spec/socket_manager_spec.rb

@@ -1,4 +1,5 @@
 require 'socket'
+require 'rr'
 
 describe ServerEngine::SocketManager do
   include_context 'test server and worker'
@@ -21,9 +22,23 @@ describe ServerEngine::SocketManager do
 
   if ServerEngine.windows?
     context 'Server.generate_path' do
-      it 'returns socket path as port number' do
-        path = SocketManager::Server.generate_path
-        expect(path).to be_between(49152, 65535)
+      context 'with socket path as port number' do
+        it 'returns a port in the dynamic port range' do
+          path = SocketManager::Server.generate_path
+          expect(path).to be_between(49152, 65535)
+        end
+
+        it 'returns a port which is not excluded' do
+          excluded_port_ranges = [
+            49152..49251,
+            50000..50059,
+          ]
+          RR.stub(SocketManager::Server).get_excluded_port_ranges { excluded_port_ranges }
+          path = SocketManager::Server.generate_path
+          excluded_port_ranges.each do |range|
+            expect(path).not_to be_between(range.first, range.last)
+          end
+        end
       end
 
       it 'can be changed via environment variable' do
@@ -33,6 +48,22 @@ describe ServerEngine::SocketManager do
         ENV.delete('SERVERENGINE_SOCKETMANAGER_PORT')
       end
     end
+
+    context 'Server.open' do
+      it 'returns server with automatically selected socket path as port number' do
+        server = SocketManager::Server.open
+        expect(server.path).to be_between(49152, 65535)
+      end
+    end
+
+    context 'Server.share_sockets_with_another_server' do
+      it 'not supported' do
+        server = SocketManager::Server.open(server_path)
+        expect { SocketManager::Server.share_sockets_with_another_server(server_path) }.to raise_error(NotImplementedError)
+      ensure
+        server.close
+      end
+    end
   else
     context 'Server.generate_path' do
       it 'returns socket path under /tmp' do
@@ -47,6 +78,172 @@ describe ServerEngine::SocketManager do
         ENV.delete('SERVERENGINE_SOCKETMANAGER_SOCK_DIR')
       end
     end
+
+    context 'Server.open' do
+      it 'returns server with automatically selected socket path under /tmp' do
+        server = SocketManager::Server.open
+        expect(server.path).to include('/tmp/SERVERENGINE_SOCKETMANAGER_')
+      end
+    end
+
+    context 'Server.share_sockets_with_another_server' do
+      it 'shares listen sockets to another server' do
+        server = SocketManager::Server.open(server_path)
+
+        client = SocketManager::Client.new(server_path)
+        tcp1 = client.listen_tcp('127.0.0.1', 55551)
+        udp1 = client.listen_udp('127.0.0.1', 55561)
+        udp2 = client.listen_udp('127.0.0.1', 55562)
+
+        another_server = SocketManager::Server.share_sockets_with_another_server(server_path)
+
+        expect([
+          another_server.tcp_sockets.keys,
+          another_server.tcp_sockets.values.map(&:addr),
+          another_server.udp_sockets.keys,
+          another_server.udp_sockets.values.map(&:addr),
+        ]).to eq([
+          server.tcp_sockets.keys,
+          server.tcp_sockets.values.map(&:addr),
+          server.udp_sockets.keys,
+          server.udp_sockets.values.map(&:addr),
+        ])
+      ensure
+        tcp1&.close
+        udp1&.close
+        udp2&.close
+        server&.close
+        another_server&.close
+      end
+
+      it 'takes over TCP sockets without downtime' do
+        manager_server = SocketManager::Server.open(server_path)
+        manager_client = SocketManager::Client.new(server_path)
+
+        has_server_started = false
+        # The old server starts listening
+        thread_server = Thread.new do
+          server = manager_client.listen_tcp('127.0.0.1', test_port)
+          has_server_started = true
+          while socket = server.accept
+            incr_test_state(:count)
+            socket.close
+          end
+        ensure
+          server&.close
+        end
+
+        sleep 0.1 until has_server_started
+
+        # The client starts sending data
+        thread_client = Thread.new do
+          100.times do |i|
+            socket = TCPSocket.new('127.0.0.1', test_port)
+            begin
+              socket.write("Hello #{i}\n")
+            ensure
+              socket.close
+            end
+            sleep 0.01
+          end
+        end
+
+        sleep 0.5
+
+        # The new server shares the sockets and starts listening in parallel with the old one
+        thread_new_server = Thread.new do
+          new_manager_server = SocketManager::Server.share_sockets_with_another_server(server_path)
+          server = manager_client.listen_tcp('127.0.0.1', test_port)
+          while socket = server.accept
+            incr_test_state(:count)
+            socket.close
+          end
+        ensure
+          new_manager_server&.close
+          server&.close
+        end
+
+        # Stop the old server
+        sleep 0.1
+        thread_server.kill
+        thread_server.join
+
+        thread_client.join
+        wait_for_stop
+
+        # Confirm that server switching was completed without data loss
+        expect(test_state(:count)).to eq(100)
+      ensure
+        manager_server&.close
+        thread_server&.kill
+        thread_new_server&.kill
+        thread_server&.join
+        thread_new_server&.join
+      end
+
+      it 'takes over UDP sockets without downtime' do
+        manager_server = SocketManager::Server.open(server_path)
+        manager_client = SocketManager::Client.new(server_path)
+
+        has_server_started = false
+        # The old server starts listening
+        thread_server = Thread.new do
+          server = manager_client.listen_udp('127.0.0.1', test_port)
+          has_server_started = true
+          while server.recv(10)
+            incr_test_state(:count)
+          end
+        ensure
+          server&.close
+        end
+
+        sleep 0.1 until has_server_started
+
+        # The client starts sending data
+        thread_client = Thread.new do
+          100.times do |i|
+            socket = UDPSocket.new
+            begin
+              socket.send("Hello #{i}\n", 0, "127.0.0.1", test_port)
+            ensure
+              socket.close
+            end
+            sleep 0.01
+          end
+        end
+
+        sleep 0.5
+
+        # The new server shares the sockets and starts listening in parallel with the old one
+        thread_new_server = Thread.new do
+          new_manager_server = SocketManager::Server.share_sockets_with_another_server(server_path)
+          server = manager_client.listen_udp('127.0.0.1', test_port)
+          while server.recv(10)
+            incr_test_state(:count)
+          end
+        ensure
+          new_manager_server&.close
+          server&.close
+        end
+
+        # Stop the old server
+        sleep 0.1
+        thread_server.kill
+        thread_server.join
+
+        thread_client.join
+        wait_for_stop
+
+        # Confirm that server switching was completed without data loss
+        expect(test_state(:count)).to eq(100)
+      ensure
+        manager_server&.close
+        thread_server&.kill
+        thread_new_server&.kill
+        thread_server&.join
+        thread_new_server&.join
+      end
+    end
   end
 
   context 'with thread' do

data/spec/spec_helper.rb

@@ -1,9 +1,6 @@
 require 'bundler'
 require 'rspec'
-
-RSpec.configure do |config|
-  config.color_enabled = true
-end
+require 'fileutils'
 
 begin
   Bundler.setup(:default, :test)

data/spec/supervisor_spec.rb

@@ -90,7 +90,7 @@ describe ServerEngine::Supervisor do
     context "when using #{sender} as command_sender" do
 
       it 'start and graceful stop' do
-        pending 'not supported on Windows' if ServerEngine.windows? && sender == 'signal'
+        skip 'not supported on Windows' if ServerEngine.windows? && sender == 'signal'
 
         sv, t = start_supervisor(command_sender: sender)
 
@@ -113,7 +113,7 @@ describe ServerEngine::Supervisor do
       end
 
       it 'immediate stop' do
-        pending 'not supported on Windows' if ServerEngine.windows? && sender == 'signal'
+        skip 'not supported on Windows' if ServerEngine.windows? && sender == 'signal'
 
         sv, t = start_supervisor(command_sender: sender)
 
@@ -131,7 +131,7 @@ describe ServerEngine::Supervisor do
       end
 
       it 'graceful restart' do
-        pending 'not supported on Windows' if ServerEngine.windows? && sender == 'signal'
+        skip 'not supported on Windows' if ServerEngine.windows? && sender == 'signal'
 
         sv, t = start_supervisor(command_sender: sender)
 
@@ -155,7 +155,7 @@ describe ServerEngine::Supervisor do
       end
 
       it 'immediate restart' do
-        pending 'not supported on Windows' if ServerEngine.windows? && sender == 'signal'
+        skip 'not supported on Windows' if ServerEngine.windows? && sender == 'signal'
 
         sv, t = start_supervisor(command_sender: sender)
 
@@ -179,7 +179,7 @@ describe ServerEngine::Supervisor do
       end
 
       it 'reload' do
-        pending 'not supported on Windows' if ServerEngine.windows? && sender == 'signal'
+        skip 'not supported on Windows' if ServerEngine.windows? && sender == 'signal'
 
         sv, t = start_supervisor(command_sender: sender)
 
@@ -200,7 +200,7 @@ describe ServerEngine::Supervisor do
       # TODO detach
 
       it 'auto restart in limited ratio' do
-        pending 'not supported on Windows' if ServerEngine.windows? && sender == 'signal'
+        skip 'not supported on Windows' if ServerEngine.windows? && sender == 'signal'
 
         RR.stub(ServerEngine).dump_uncaught_error
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverengine
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-28 00:00:00.000000000 Z
+date: 2024-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sigdump
@@ -24,34 +24,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
@@ -115,8 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/linux.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - Changelog
@@ -167,7 +194,7 @@ homepage: https://github.com/fluent/serverengine
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -175,15 +202,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: ServerEngine - multiprocess server framework
 test_files:

data/.github/workflows/windows.yml

@@ -1,42 +0,0 @@
-name: Testing on Windows
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
-jobs:
-  test:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.1', '2.7' ]
-        os:
-          - windows-latest
-        include:
-          - ruby: '3.0.3'
-            os: windows-latest
-            # On Ruby 3.0, we need to use fiddle 1.0.8 or later to retrieve correct
-            # error code. In addition, we have to specify the path of fiddle by RUBYLIB
-            # because RubyInstaller loads Ruby's bundled fiddle before initializing gem.
-            # See also:
-            # * https://github.com/ruby/fiddle/issues/72
-            # * https://bugs.ruby-lang.org/issues/17813
-            # * https://github.com/oneclick/rubyinstaller2/blob/8225034c22152d8195bc0aabc42a956c79d6c712/lib/ruby_installer/build/dll_directory.rb
-            ruby-lib-opt: RUBYLIB=%RUNNER_TOOL_CACHE%/Ruby/3.0.3/x64/lib/ruby/gems/3.0.0/gems/fiddle-1.1.0/lib
-
-    name: Unit testing with Ruby ${{ matrix.ruby }} on ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Add Fiddle 1.1.0
-        if: ${{ matrix.ruby == '3.0.3' }}
-        run: gem install fiddle --version 1.1.0
-      - name: Install dependencies
-        run: ridk exec bundle install --jobs 4 --retry 3
-      - name: Run tests
-        run: bundle exec rake spec ${{ matrix.ruby-lib-opt }}