tp2 0.8.1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75f66b5020339be69ee5ee0122eea1673a4f96330cedfec95cde805ef43b9221
-  data.tar.gz: efc072f110cacc703c6ae75f4bade2a0753c73ecffae0f3055f6346eb165c79d
+  metadata.gz: 991ec5937591a3e57675d686d11670b682e7c5644391b4f301b091befcbae17f
+  data.tar.gz: 7413f8027c235ff4377077d7391b58c7540cf1257d05c3d9c6b837705c1c1329
 SHA512:
-  metadata.gz: 5d522b6958b99135fe730b514d30ec8be9e18e01cabce1892e188ca2c255c5f963c4fc6ecf6c6b6f82b0c7ef9fc10c56dd2020a57bfbf9ea7abf27b3a3c88d2b
-  data.tar.gz: 64a166087f1bae5a36f648ae2068ffa731fc4ecba6e77c400a311fc8be82eea795cf25b640f94f91731d7d3d7484645837b462a0058159a3eb68f2787e54e8d5
+  metadata.gz: fead1d1fdfad4ad3a66e757ed9613af4651fe25fe112cfede015d7c410f4655e52f51eaaa7b7530aea84d49201566088e88305464cd823a8dd9583b7bf21297d
+  data.tar.gz: 01cfb68c33c5a7b2a652e7d01d87798be696dc3bcbc0a62dbc1b9c134e709170cc9fc35d9ca4873518bb308eccf0f0973720238814f167e52f34a203cfff03d8

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# Version 0.8.3 2025-06-09
+
+- Improve error handling
+
+# Version 0.8.2 2025-06-07
+
+- Improve logging
+
 # Version 0.8 2025-06-07
 
 - Add silent mode

data/lib/tp2/http1_adapter.rb

@@ -16,6 +16,7 @@ module TP2
 
       @done = nil
       @response_headers = nil
+      @status = nil
     end
 
     def run
@@ -25,13 +26,18 @@ module TP2
         persist = serve_request
         break if !persist
       end
-    rescue UM::Terminate
-      # terminated
     rescue Exception => e
-      puts '!' * 40
-      p e
-      puts e.backtrace.join("\n")
-      exit!
+      case e
+      when UM::Terminate
+        # we're done
+      when SystemCallError
+        @opts[:log]&.log("Encountered #{e.class}, closing connection")
+      when StandardError
+        @opts[:log]&.log("Unhandled exception #{e.class}: #{e.message}, closing connection")
+        @opts[:log]&.log(e.backtrace.join("\n"))
+      else
+        raise
+      end
     ensure
       @machine.close(@fd)
     end
@@ -161,16 +167,17 @@ module TP2
     private
 
     def log(request, response_headers)
+      return if !@opts[:log]
+      
       request_headers = request.headers
       str = format(
-        "%<stamp>s %<method>s %<path>s %<status>s %<tx>d\n",
-        stamp:  Time.now.strftime('%Y-%m-%d %H:%M:%S.%3N'),
+        "%<method>s %<path>s %<status>s %<tx>d",
         method: request_headers[':method'].upcase,
         path:   request_headers[':path'],
         status: @status,
         tx:     request_headers[':tx']
       )
-      @machine.write_async(1, str)
+      @opts[:log].log(str)
     end
 
     RE_REQUEST_LINE = /^([a-z]+)\s+([^\s]+)\s+(http\/[0-9\.]{1,3})/i.freeze

data/lib/tp2/logger.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module TP2
+  class Logger
+    def initialize(machine, fd = STDOUT.fileno, **opts)
+      @machine = machine
+      @fd = fd
+      @opts = opts
+    end
+
+    def log(str)
+      str = format("%s %s\n", Time.now.strftime('%Y-%m-%d %H:%M:%S.%3N'), str)
+      @machine.write_async(@fd, str)
+    end
+  end
+end

data/lib/tp2/server.rb

@@ -15,9 +15,9 @@ module TP2
       TP2::RackAdapter.load(opts[:app_location])
     end
 
-    def self.tp2_app(opts)
+    def self.tp2_app(machine, opts)
       if opts[:app_location]
-        puts "Loading app at #{opts[:app_location]}" if opts[:log]
+        opts[:log]&.log("Loading app at #{opts[:app_location]}")
         require opts[:app_location]
 
         opts.merge!(TP2.config)
@@ -40,7 +40,7 @@ module TP2
     def app_from_opts
       case @opts[:app_type]
       when nil, :tp2
-        Server.tp2_app(@opts)
+        Server.tp2_app(@machine, @opts)
       when :rack
         Server.rack_app(@opts)
       when :static
@@ -67,7 +67,7 @@ module TP2
         @accept_fibers << @machine.spin { accept_incoming(fd) }
       end
       bind_string = bind_info.map { it.join(':') }.join(", ")
-      @machine.puts("Listening on #{bind_string}") if @opts[:log]
+      @opts[:log]&.log("Listening on #{bind_string}")
       
       # map fibers
       @connection_fiber_map = {}
@@ -123,6 +123,8 @@ module TP2
     end
 
     def graceful_shutdown
+      @opts[:log]&.log("Shutting down gracefully...")
+
       # stop listening
       close_all_server_fds
       @machine.snooze

data/lib/tp2/version.rb

@@ -1,3 +1,3 @@
 module TP2
-  VERSION = '0.8.1'
+  VERSION = '0.8.3'
 end

data/lib/tp2.rb

@@ -3,6 +3,7 @@
 require 'uringmachine'
 require 'tp2/version'
 require 'tp2/server'
+require 'tp2/logger'
 
 class UringMachine
   def puts(str)
@@ -24,16 +25,23 @@ module TP2
   
   class << self
     def run(opts = nil, &app)
-      return if @in_run
+      if @in_run
+        @config = opts if opts
+        @config[:app] = app if app
+        return
+      end
 
       opts ||= @config || {}
       begin
         @in_run = true
         machine = UM.new
+
+        machine.puts(TP2::BANNER) if opts[:banner]
+        opts[:log] = opts[:log] && TP2::Logger.new(machine, **opts)
+
         server = Server.new(machine, opts, &app)
 
         setup_signal_handling(machine, Fiber.current)
-        machine.puts(TP2::BANNER) if opts[:banner]
         server.run
       ensure
         @in_run = false
@@ -59,7 +67,6 @@ module TP2
     # to be done
     def watch_for_int_signal(machine, queue, fiber)
       sig = machine.shift(queue)
-      machine.puts("\nGot #{sig} signal, shutting down gracefully...")
       machine.schedule(fiber, UM::Terminate.new)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tp2
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.3
 platform: ruby
 authors:
 - Sharon Rosner
@@ -71,6 +71,7 @@ files:
 - examples/simple.rb
 - lib/tp2.rb
 - lib/tp2/http1_adapter.rb
+- lib/tp2/logger.rb
 - lib/tp2/rack_adapter.rb
 - lib/tp2/request_extensions.rb
 - lib/tp2/server.rb