tp2 0.12.2 → 0.12.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a6c5182e2812a0c3752fff1e8b0bf694d8cf99979e106a1594e710eba1339d4
-  data.tar.gz: a3d7456e36e6aa4783bc6f18c27acd11ce807029c253bd7d54cfd2599d6d89e8
+  metadata.gz: d6e848dd7ab2f886c616d6e810cd49c2455fd2a07fd713a4520a0b36e47a6f75
+  data.tar.gz: da07a4c51e6e1daa876ec2fe5f4f2b38fe38c0aa97e4232f00f9746742743808
 SHA512:
-  metadata.gz: ad1afb037882c70c64f84c92d45393517d2e6e4bf3a3c487fdcf65330ee867ec9e20c87bbef18a4d6325244289bfa2fa3a80836c2ff4020eab4a1c141265a802
-  data.tar.gz: 35649e0932b66fc2592a2fb7bd56ef8ee554176b26e134ac253b573ec15d4c2b7888352241f9a184db0f2776102cedceb7a1a8338759a73c8b38646266bd4a13
+  metadata.gz: c46797d8149f470b284e0b8a917e0098f35099dd2d4540d115162cbaaeca3fb9e6926115d3e0798e6fe330a37f901b6ac465bab5953b58b689ed5c91c10cb0e7
+  data.tar.gz: b4512a4662394b7af833e272ed1d9c63bc1ddb1dd44a1c2f354a4d381935fbce8423f9e9558f663113fdb667687bff1acf90dfb58404e06ae1129b9a10ff642b

data/.rubocop.yml

@@ -61,10 +61,8 @@ Layout/HashAlignment:
   EnforcedColonStyle: table
   EnforcedHashRocketStyle: table
 
-# Naming/AccessorMethodName:
-#   Exclude:
-#     - lib/polyphony/extensions/fiber.rb
-#     - examples/**/*.rb
+Naming/AccessorMethodName:
+  Enabled: false
 
 # Naming/MethodName:
 #   Exclude:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 0.12.3 2025-06-25
+
+- Fix logging of simple strings
+
 # Version 0.12.2 2025-06-24
 
 - Make banner pluggable

data/bin/tp2

@@ -92,4 +92,7 @@ end
 detect_app(opts) if !opts[:app_type]
 
 RubyVM::YJIT.enable rescue nil
+
+opts[:machine] = UM.new
+opts[:logger] = opts[:logger] && TP2::Logger.new(opts[:machine], **opts)
 TP2.run(opts)

data/lib/tp2/logger.rb

@@ -17,14 +17,25 @@ module TP2
       @machine.write_async(@fd, str)
     end
 
-    def call(request, _response_headers)
-      if request.is_a?(Exception)
-        e = request
-        log("Error: #{e.inspect}: #{e.backtrace.inspect}")
-        return
+    def call(o, _response_headers = nil)
+      log(format_log_line(o))
+    end
+
+    def format_log_line(o)
+      case o
+      when Exception
+        format_error_log_line(o)
+      when Qeweney::Request
+        format_request_log_line(o)
+      when String
+        o
+      else
+        o.to_s
       end
+    end
 
-      log(format_request_log_line(request))
+    def format_error_log_line(err)
+      "Error: #{err.inspect}: #{err.backtrace.inspect}"
     end
 
     def format_request_log_line(request)

data/lib/tp2/server.rb

@@ -10,14 +10,14 @@ module TP2
     PENDING_REQUESTS_TIMEOUT_PERIOD = 5
 
     def self.rack_app(opts)
-      raise "Missing app location" if !opts[:app_location]
+      raise 'Missing app location' if !opts[:app_location]
 
       TP2::RackAdapter.load(opts[:app_location])
     end
 
-    def self.tp2_app(machine, opts)
+    def self.tp2_app(_machine, opts)
       if opts[:app_location]
-        opts[:log]&.log("Loading app at #{opts[:app_location]}")
+        opts[:logger]&.call("Loading app at #{opts[:app_location]}")
         require opts[:app_location]
 
         opts.merge!(TP2.config)
@@ -25,9 +25,7 @@ module TP2
       opts[:app]
     end
 
-    def self.static_app(opts)
-    end
-
+    def self.static_app(opts); end
 
     def initialize(machine, opts, &app)
       @machine = machine
@@ -49,7 +47,7 @@ module TP2
         raise "Invalid app type #{@opts[:app_type].inspect}"
       end
     end
-  
+
     def run
       setup
       @machine.join(*@accept_fibers)
@@ -66,9 +64,9 @@ module TP2
         @server_fds << fd
         @accept_fibers << @machine.spin { accept_incoming(fd) }
       end
-      bind_string = bind_info.map { it.join(':') }.join(", ")
-      @opts[:log]&.log("Listening on #{bind_string}")
-      
+      bind_string = bind_info.map { it.join(':') }.join(', ')
+      @opts[:logger]&.call("Listening on #{bind_string}")
+
       # map fibers
       @connection_fiber_map = {}
     end
@@ -123,7 +121,7 @@ module TP2
     end
 
     def graceful_shutdown
-      @opts[:log]&.log("Shutting down gracefully...")
+      @opts[:logger]&.call('Shutting down gracefully...')
 
       # stop listening
       close_all_server_fds
@@ -142,7 +140,7 @@ module TP2
 
       @machine.timeout(PENDING_REQUESTS_TIMEOUT_PERIOD, UM::Terminate) do
         @machine.join(*@connection_fiber_map.keys)
-    rescue UM::Terminate
+      rescue UM::Terminate
         # timeout on waiting for adapters to finish running, do nothing
       end
     end

data/lib/tp2/version.rb

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

data/lib/tp2.rb

@@ -35,9 +35,7 @@ module TP2
       begin
         @in_run = true
         machine = opts[:machine] || UM.new
-
         machine.puts(opts[:banner]) if opts[:banner]
-        opts[:logger] = opts[:logger] && TP2::Logger.new(machine, **opts)
 
         server = Server.new(machine, opts, &app)
 

metadata

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