tp2 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d8c8ee2edd1c72a68b21c3ea27dc208c0dbfcbb2a6d78d76abb3ec11f115977
-  data.tar.gz: 5fb43258443827cf5fa44fc1ddd4960740d8694d5469fac70875c46c54558c15
+  metadata.gz: a9c8c52c6ec2e5db6393b54f0ccf96010c9c626984ea943075f1675a078e9eae
+  data.tar.gz: 80cf94801b882350e72d50b21e9e004c544d239e3a05e04e99db4543e88deb73
 SHA512:
-  metadata.gz: e6c54083c10368f84bd23a0bfd235f01aa74690f7d02667a54c539921e9dc601e7f513858d3a85eee17229d4f4f12a6482d219feb1c1820cd2622c7e70e0dfa9
-  data.tar.gz: 134a0b072495b5d23f02d1d19e86db66f4f78ffea81ce1e20b48660d77c61966bf83e4876f4870b33f8d63102274d3f3e3555e3166d02cfcaa0086aacdff2520
+  metadata.gz: 48484025b54dc3a7ea959c795ed6575d62eae1165f97ed5171343616af84da1fce9cc2e818f7e3fb540dab146b6f0bd8e1a076fba6050e03cb78cfd479615449
+  data.tar.gz: a3a65e353b9a5f4c1d4d3af7a4a6977f77ed7c38a1c10eb85c4a4afbbc6cc4a4c8e244be482c66b9e1ce6c61b52ffd0755959e3dff545d87b310011598baec9a

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# Version 0.5 2025-05-05
+
+- Implement graceful shutdown
+
+# Version 0.4 2025-05-02
+
+- Add adapter and server tests
+- Remove http/parser dependency, use regexs to parse HTTP requests

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    tp2 (0.4)
+    tp2 (0.5)
       qeweney (= 0.21)
-      uringmachine (= 0.7)
+      uringmachine (= 0.8)
 
 GEM
   remote: https://rubygems.org/
@@ -36,7 +36,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    uringmachine (0.7)
+    uringmachine (0.8)
     yard (0.9.37)
 
 PLATFORMS

data/examples/simple.rb

@@ -16,12 +16,19 @@ machine = UM.new
 server = TP2::Server.new(machine, '0.0.0.0', 1234, &app)
 puts "Listening on port 1234..."
 
-machine.spin { server.run }
+server_fiber = machine.spin { server.run }
 
-main = Fiber.current
-trap('SIGINT') { machine.schedule(main, nil) }
+sig_queue = UM::Queue.new
+trap('SIGINT') { machine.push(sig_queue, :SIGINT) }
 
 puts "Running... (pid: #{Process.pid})"
 STDOUT.flush
-machine.yield # wait for termination
+
+# wait for signal
+sig = machine.shift(sig_queue)
+
+puts "Got signal (#{sig}), shutting down gracefully..."
+machine.schedule(server_fiber, UM::Terminate.new)
+machine.join(server_fiber)
+
 puts

data/lib/tp2/http1_adapter.rb

@@ -20,8 +20,10 @@ module TP2
         persist = serve_request
         break if !persist
       end
+    rescue UM::Terminate
+      # do nothing
     rescue => e
-      puts '*' * 40
+      puts '!' * 40
       p e
       puts e.backtrace.join("\n")
       exit!

data/lib/tp2/server.rb

@@ -5,6 +5,9 @@ require 'tp2/request_extensions'
 
 module TP2
   class Server
+    PENDING_REQUESTS_GRACE_PERIOD = 0.1
+    PENDING_REQUESTS_TIMEOUT_PERIOD = 5
+
     def initialize(machine, hostname, port, &app)
       @machine = machine
       @hostname = hostname
@@ -12,21 +15,61 @@ module TP2
       @app = app
     end
 
+    def run
+      setup
+      accept_incoming
+    rescue UM::Terminate
+      graceful_shutdown
+    end
+
+    private
+
     def setup
       @server_fd = @machine.socket(UM::AF_INET, UM::SOCK_STREAM, 0, 0)
       @machine.setsockopt(@server_fd, UM::SOL_SOCKET, UM::SO_REUSEADDR, true)
       @machine.bind(@server_fd, @hostname, @port)
       @machine.listen(@server_fd, UM::SOMAXCONN)
 
+      # map fibers
+      @fiber_map = {}
+
       # puts "Listening on #{@hostname}:#{@port}"
     end
 
-    def run
-      setup
+    def accept_incoming
       @machine.accept_each(@server_fd) do |fd|
         conn = HTTP1Adapter.new(@machine, fd, &@app)
-        @machine.spin(conn) { it.run }
+        f = @machine.spin(conn) do
+          it.run
+        ensure
+          @fiber_map.delete(f)
+        end
+        @fiber_map[f] = true
+      end
+    end
+
+    def graceful_shutdown
+      # stop listening
+      @machine.close(@server_fd)
+
+      return if @fiber_map.empty?
+
+      # sleep for a bit, let requests finish
+      @machine.sleep(PENDING_REQUESTS_GRACE_PERIOD)
+      return if @fiber_map.empty?
+
+      # terminate pending fibers
+      pending = @fiber_map.keys
+      signal = UM::Terminate.new
+      pending.each { @machine.schedule(it, signal) }
+
+      @machine.timeout(PENDING_REQUESTS_TIMEOUT_PERIOD, UM::Terminate) do
+        @machine.join(*@fiber_map.keys)
+      rescue UM::Terminate
+        # timeout on waiting for adapters to finish running, do nothing
       end
+    ensure
+      @machine.close(@server_fd)
     end
   end
 end

data/lib/tp2/version.rb

@@ -1,3 +1,3 @@
 module TP2
-  VERSION = '0.4'
+  VERSION = '0.5'
 end

data/test/test_server.rb

@@ -85,6 +85,26 @@ class ServerTest < Minitest::Test
     assert_equal(expected, response)
   end
 
+  def test_graceful_shutdown
+    @app = ->(req) do
+      @machine.sleep(1)
+      req.respond('Hello, world!', {})
+    rescue UM::Terminate
+      req.respond('Terminated!', {})
+      raise
+    end
+
+    write_http_request "GET /foo HTTP/1.1\r\nServer: foo.com\r\n\r\nSCHMET /bar HTTP/1.1\r\n\r\n"
+
+    @machine.sleep(0.01)
+    @machine.schedule(@f_server, UM::Terminate.new)
+    @machine.snooze
+
+    response = read_client_side
+    expected = "HTTP/1.1 200\r\nContent-Length: 11\r\n\r\nTerminated!"
+    assert_equal(expected, response)
+  end
+
   def test_pipelined_requests_with_body
     skip
 

data/tp2.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.required_ruby_version = '>= 3.4'
 
-  s.add_dependency 'uringmachine',    '0.7'
+  s.add_dependency 'uringmachine',    '0.8'
   s.add_dependency 'qeweney',         '0.21'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tp2
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Sharon Rosner
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +44,7 @@ extra_rdoc_files:
 - README.md
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md