tp2 0.11 → 0.11.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7794469f473ba02c2feb32c638c8659536b5b04b32e1b93479af7638e76e1019
4
- data.tar.gz: 567e71e0a872ee5a5abcaa00208b149e2b59a69fe3e42f1e73687e3a79a036f9
3
+ metadata.gz: 69d5ffc704823ef9650889a3b0ce785aa9aae379905940672ad89ecb6dca0d2b
4
+ data.tar.gz: 8375c0c32f27279c104351821c2dc07ec5dd7ae5b735b64ce3d5dfa774a95c64
5
5
  SHA512:
6
- metadata.gz: 21ffae9b2a103464dcfc23eae43020df47173c3ff0c8354ec57755dd45607ae56c9b0be14f95291f2b7ae1c2f768b3981553a3a2bee590ec83aa2497f1b2e631
7
- data.tar.gz: fb203df62bba5e961bcbf380117eaec22c249dd7ed1615e4f6ce59d287ebb4f2901aad30dd8ac0759295882d4b6f9dbdea2e0f594298d9e4972d1e8a6e9a881f
6
+ metadata.gz: c6c9ac7ee73752d17d56dcdbb9d87bb74a0712f93328f7b8d57352de069595b45e9cf94d67f178828e39ee2a792e19f760550e9c2d08f7e11f3eaeb929e56e16
7
+ data.tar.gz: e0665223dba5271296c2fa8ab4aa624a280a97a86af609e9fd3ff5b9a3f215b65012f7d077f1fca3a5dc8dd698fbe96a8294c87d76bd2383a552aadb064c4bc5
data/CHANGELOG.md CHANGED
@@ -1,3 +1,11 @@
1
+ # Version 0.11.2 2025-06-15
2
+
3
+ - Improve URI calculation for logging
4
+
5
+ # Version 0.11.1 2025-06-15
6
+
7
+ - Add more info to log
8
+
1
9
  # Version 0.11 2025-06-13
2
10
 
3
11
  - Improve logging for protocol errors
@@ -208,16 +208,28 @@ module TP2
208
208
  return if !@opts[:log]
209
209
 
210
210
  request_headers = request.headers
211
+ uri = full_uri(request_headers)
212
+
211
213
  str = format(
212
- "%<method>s %<path>s %<status>s %<tx>d",
213
- method: request_headers[':method'].upcase,
214
- path: request_headers[':path'],
215
- status: @status,
216
- tx: request_headers[':tx']
214
+ "%<client_ip>s %<method>s %<uri>s %<status>s %<tx>d",
215
+ client_ip: request.forwarded_for || '?',
216
+ method: request_headers[':method'].upcase,
217
+ uri: uri,
218
+ status: @status,
219
+ tx: request_headers[':tx']
217
220
  )
218
221
  @opts[:log].log(str)
219
222
  end
220
223
 
224
+ def full_uri(headers)
225
+ format(
226
+ "%s://%s%s",
227
+ headers['x_forwarded_proto'] || 'http',
228
+ headers['host'],
229
+ headers[':path']
230
+ )
231
+ end
232
+
221
233
  RE_REQUEST_LINE = /^([a-z]+)\s+([^\s]+)\s+(http\/[0-9\.]{1,3})/i.freeze
222
234
  RE_HEADER_LINE = /^([a-z0-9\-]+)\:\s+(.+)/i.freeze
223
235
  MAX_REQUEST_LINE_LEN = 1 << 14 # 16KB
data/lib/tp2/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module TP2
2
- VERSION = '0.11'
2
+ VERSION = '0.11.2'
3
3
  end
data/tp2.gemspec CHANGED
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
20
20
  s.required_ruby_version = '>= 3.4'
21
21
  s.executables = ['tp2']
22
22
 
23
- s.add_dependency 'uringmachine', '>=0.14'
24
- s.add_dependency 'qeweney', '0.21'
25
- s.add_dependency 'rack', '3.1.15'
23
+ s.add_dependency 'uringmachine', '~> 0.14'
24
+ s.add_dependency 'qeweney', '~> 0.21'
25
+ s.add_dependency 'rack', '~> 3.1.15'
26
26
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tp2
3
3
  version: !ruby/object:Gem::Version
4
- version: '0.11'
4
+ version: 0.11.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sharon Rosner
@@ -13,42 +13,42 @@ dependencies:
13
13
  name: uringmachine
14
14
  requirement: !ruby/object:Gem::Requirement
15
15
  requirements:
16
- - - ">="
16
+ - - "~>"
17
17
  - !ruby/object:Gem::Version
18
18
  version: '0.14'
19
19
  type: :runtime
20
20
  prerelease: false
21
21
  version_requirements: !ruby/object:Gem::Requirement
22
22
  requirements:
23
- - - ">="
23
+ - - "~>"
24
24
  - !ruby/object:Gem::Version
25
25
  version: '0.14'
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: qeweney
28
28
  requirement: !ruby/object:Gem::Requirement
29
29
  requirements:
30
- - - '='
30
+ - - "~>"
31
31
  - !ruby/object:Gem::Version
32
32
  version: '0.21'
33
33
  type: :runtime
34
34
  prerelease: false
35
35
  version_requirements: !ruby/object:Gem::Requirement
36
36
  requirements:
37
- - - '='
37
+ - - "~>"
38
38
  - !ruby/object:Gem::Version
39
39
  version: '0.21'
40
40
  - !ruby/object:Gem::Dependency
41
41
  name: rack
42
42
  requirement: !ruby/object:Gem::Requirement
43
43
  requirements:
44
- - - '='
44
+ - - "~>"
45
45
  - !ruby/object:Gem::Version
46
46
  version: 3.1.15
47
47
  type: :runtime
48
48
  prerelease: false
49
49
  version_requirements: !ruby/object:Gem::Requirement
50
50
  requirements:
51
- - - '='
51
+ - - "~>"
52
52
  - !ruby/object:Gem::Version
53
53
  version: 3.1.15
54
54
  email: sharon@noteflakes.com