tp2 0.12.3.1 → 0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6e848dd7ab2f886c616d6e810cd49c2455fd2a07fd713a4520a0b36e47a6f75
-  data.tar.gz: da07a4c51e6e1daa876ec2fe5f4f2b38fe38c0aa97e4232f00f9746742743808
+  metadata.gz: 1a439c912a6726db661e6911ce5cc5cb89a10df9052f2be041edf5f98bbb48d1
+  data.tar.gz: 23e305d5e630d336c755148d81c806450b17b1e01465e701d3cbb92b4fac8e80
 SHA512:
-  metadata.gz: c46797d8149f470b284e0b8a917e0098f35099dd2d4540d115162cbaaeca3fb9e6926115d3e0798e6fe330a37f901b6ac465bab5953b58b689ed5c91c10cb0e7
-  data.tar.gz: b4512a4662394b7af833e272ed1d9c63bc1ddb1dd44a1c2f354a4d381935fbce8423f9e9558f663113fdb667687bff1acf90dfb58404e06ae1129b9a10ff642b
+  metadata.gz: 440aec3cb21f79785fee1a45e3d03ba2612bd1a7567b9e7c597c7a6a933f63ea60b200877ecc1296013d27236b1652139b64182aecd34f091e495affa17db16a
+  data.tar.gz: 688319dc5c58364f778129746f934cabb2b444e0594f8d0e33d97ca8a20b658419ccc52fb9410fd3c4dc11fbb8d1d595417b421c01fce5a0e631c72f35fd1737

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# Version 0.13 2025-06-25
+
+- Show response status in log line
+- Fix behaviour in case of an unhandled exception in app
+
 # Version 0.12.3 2025-06-25
 
 - Fix logging of simple strings

data/examples/app.rb

@@ -5,6 +5,7 @@ require 'tp2'
 require 'json'
 
 TP2.config do |req|
+  raise 'foo'
   body = req.headers.to_json
   req.respond(body, 'Content-Type' => 'application/json')
 end

data/lib/tp2/http1_connection.rb

@@ -11,6 +11,7 @@ module TP2
       @machine = machine
       @fd = fd
       @opts = opts
+      @logger = opts[:logger]
       @stream = UM::Stream.new(machine, fd)
       @app = app
 
@@ -29,7 +30,7 @@ module TP2
     rescue UM::Terminate, SystemCallError
       # we're done, we don't care about broken socket
     rescue StandardError => e
-      @opts[:logger]&.call(e, nil)
+      @logger&.call(e)
     ensure
       @machine.close_async(@fd)
     end
@@ -45,6 +46,13 @@ module TP2
     rescue ProtocolError
       # TODO: add hook for testing protocol errors
       false
+    rescue StandardError => e
+      msg = "Internal error while serving request: #{e.message} (#{e.backtrace.inspect})"
+      @logger&.call(msg)
+      if request && !@done
+        respond(request, 'Internal server error', ':status' => Qeweney::Status::INTERNAL_SERVER_ERROR)
+      end
+      false
     end
 
     def get_body(req)
@@ -104,7 +112,7 @@ module TP2
       else
         @machine.send(@fd, formatted_headers, formatted_headers.bytesize, SEND_FLAGS)
       end
-      @opts[:logger]&.call(request, headers)
+      @logger&.call(request, headers)
       @done = true
       @response_headers = headers
     end
@@ -143,7 +151,7 @@ module TP2
       @machine.send(@fd, data, data.bytesize, SEND_FLAGS)
       return if @done || !done
 
-      @opts[:logger]&.call(request, @response_headers)
+      @logger&.call(request, @response_headers)
       @done = true
     end
 
@@ -155,7 +163,7 @@ module TP2
       @machine.send(@fd, EMPTY_CHUNK, EMPTY_CHUNK_LEN, SEND_FLAGS)
       return if @done
 
-      @opts[:logger]&.call(request, @response_headers)
+      @logger&.call(request, @response_headers)
       @done = true
     end
 

data/lib/tp2/logger.rb

@@ -17,16 +17,22 @@ module TP2
       @machine.write_async(@fd, str)
     end
 
-    def call(o, _response_headers = nil)
-      log(format_log_line(o))
+    # @param o <Qeweney::Request> request
+    # @param h <Hash, nil> response headers
+    def call(o, h = nil)
+      log(format_log_line(o, h))
+    rescue => e
+      p e: e
+      p e.backtrace
+      exit!
     end
 
-    def format_log_line(o)
+    def format_log_line(o, h)
       case o
       when Exception
         format_error_log_line(o)
       when Qeweney::Request
-        format_request_log_line(o)
+        format_request_log_line(o, h)
       when String
         o
       else
@@ -38,16 +44,16 @@ module TP2
       "Error: #{err.inspect}: #{err.backtrace.inspect}"
     end
 
-    def format_request_log_line(request)
+    def format_request_log_line(request, response_headers)
       request_headers = request.headers
       uri = full_uri(request_headers)
-
+      status = response_headers[':status'] || '200'
       format(
         '%<client_ip>s %<method>s %<uri>s %<status>s %<tx>d',
         client_ip:  request.forwarded_for || '?',
         method:     request_headers[':method'].upcase,
         uri:        uri,
-        status:     @status,
+        status:     status,
         tx:         request_headers[':tx']
       )
     end

data/lib/tp2/version.rb

@@ -1,3 +1,3 @@
 module TP2
-  VERSION = '0.12.3.1'
+  VERSION = '0.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tp2
 version: !ruby/object:Gem::Version
-  version: 0.12.3.1
+  version: '0.13'
 platform: ruby
 authors:
 - Sharon Rosner