tp2 0.11 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7794469f473ba02c2feb32c638c8659536b5b04b32e1b93479af7638e76e1019
-  data.tar.gz: 567e71e0a872ee5a5abcaa00208b149e2b59a69fe3e42f1e73687e3a79a036f9
+  metadata.gz: 69d5ffc704823ef9650889a3b0ce785aa9aae379905940672ad89ecb6dca0d2b
+  data.tar.gz: 8375c0c32f27279c104351821c2dc07ec5dd7ae5b735b64ce3d5dfa774a95c64
 SHA512:
-  metadata.gz: 21ffae9b2a103464dcfc23eae43020df47173c3ff0c8354ec57755dd45607ae56c9b0be14f95291f2b7ae1c2f768b3981553a3a2bee590ec83aa2497f1b2e631
-  data.tar.gz: fb203df62bba5e961bcbf380117eaec22c249dd7ed1615e4f6ce59d287ebb4f2901aad30dd8ac0759295882d4b6f9dbdea2e0f594298d9e4972d1e8a6e9a881f
+  metadata.gz: c6c9ac7ee73752d17d56dcdbb9d87bb74a0712f93328f7b8d57352de069595b45e9cf94d67f178828e39ee2a792e19f760550e9c2d08f7e11f3eaeb929e56e16
+  data.tar.gz: e0665223dba5271296c2fa8ab4aa624a280a97a86af609e9fd3ff5b9a3f215b65012f7d077f1fca3a5dc8dd698fbe96a8294c87d76bd2383a552aadb064c4bc5

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# Version 0.11.2 2025-06-15
+
+- Improve URI calculation for logging
+
+# Version 0.11.1 2025-06-15
+
+- Add more info to log
+
 # Version 0.11 2025-06-13
 
 - Improve logging for protocol errors

data/lib/tp2/http1_adapter.rb

@@ -208,16 +208,28 @@ module TP2
       return if !@opts[:log]
       
       request_headers = request.headers
+      uri = full_uri(request_headers)
+
       str = format(
-        "%<method>s %<path>s %<status>s %<tx>d",
-        method: request_headers[':method'].upcase,
-        path:   request_headers[':path'],
-        status: @status,
-        tx:     request_headers[':tx']
+        "%<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,
+        tx:         request_headers[':tx']
       )
       @opts[:log].log(str)
     end
 
+    def full_uri(headers)
+      format(
+        "%s://%s%s",
+        headers['x_forwarded_proto'] || 'http',
+        headers['host'],
+        headers[':path']
+      )
+    end
+
     RE_REQUEST_LINE = /^([a-z]+)\s+([^\s]+)\s+(http\/[0-9\.]{1,3})/i.freeze
     RE_HEADER_LINE = /^([a-z0-9\-]+)\:\s+(.+)/i.freeze
     MAX_REQUEST_LINE_LEN = 1 << 14 # 16KB

data/lib/tp2/version.rb

@@ -1,3 +1,3 @@
 module TP2
-  VERSION = '0.11'
+  VERSION = '0.11.2'
 end

data/tp2.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 3.4'
   s.executables   = ['tp2']
 
-  s.add_dependency 'uringmachine',    '>=0.14'
-  s.add_dependency 'qeweney',         '0.21'
-  s.add_dependency 'rack',            '3.1.15'
+  s.add_dependency 'uringmachine',    '~> 0.14'
+  s.add_dependency 'qeweney',         '~> 0.21'
+  s.add_dependency 'rack',            '~> 3.1.15'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tp2
 version: !ruby/object:Gem::Version
-  version: '0.11'
+  version: 0.11.2
 platform: ruby
 authors:
 - Sharon Rosner
@@ -13,42 +13,42 @@ dependencies:
   name: uringmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.15
 email: sharon@noteflakes.com