getaround_utils 0.2.24 → 0.2.25
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +11 -9
- data/getaround_utils.gemspec +1 -1
- data/lib/getaround_utils/railties/ougai.rb +19 -9
- data/lib/getaround_utils/version.rb +1 -1
- metadata +10 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2f6dd68f18739dcc00d036bb09895bd7a9ea55cafb8b75c7b27f0fb1b9d0c9ed
|
4
|
+
data.tar.gz: 76fd9e2acedc062898d72a3f86f08c892157f3e36db8a5839025c346cd1e324e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d885550f6cc2d3d7f829696457a6cc29cc08be3118b0ab8daf66d680942d26d5ac4242bc22277c87d694f4666c215f78ae4dbf8b2a0fbb692010d82694325180
|
7
|
+
data.tar.gz: 96a3ab41e81e981db9ed51288d9bccd7fbf4f21255e80832c2fa5c924d328a660f332975b602867a7e35e7dbd4259faa42e2f9d9e2ea092a4a05fb1e88f0005f
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
getaround_utils (0.2.
|
4
|
+
getaround_utils (0.2.25)
|
5
5
|
|
6
6
|
GEM
|
7
7
|
remote: https://rubygems.org/
|
@@ -71,7 +71,7 @@ GEM
|
|
71
71
|
builder (3.2.4)
|
72
72
|
coderay (1.1.3)
|
73
73
|
concurrent-ruby (1.1.10)
|
74
|
-
connection_pool (2.
|
74
|
+
connection_pool (2.3.0)
|
75
75
|
crack (0.4.5)
|
76
76
|
rexml
|
77
77
|
crass (1.0.6)
|
@@ -120,7 +120,7 @@ GEM
|
|
120
120
|
method_source (~> 1.0)
|
121
121
|
public_suffix (4.0.6)
|
122
122
|
racc (1.6.0)
|
123
|
-
rack (2.2.
|
123
|
+
rack (2.2.5)
|
124
124
|
rack-test (1.1.0)
|
125
125
|
rack (>= 1.0, < 3)
|
126
126
|
rails (6.1.4.6)
|
@@ -151,7 +151,8 @@ GEM
|
|
151
151
|
thor (~> 1.0)
|
152
152
|
rainbow (3.1.1)
|
153
153
|
rake (13.0.6)
|
154
|
-
redis (
|
154
|
+
redis-client (0.12.0)
|
155
|
+
connection_pool
|
155
156
|
regexp_parser (2.2.1)
|
156
157
|
relaxed-rubocop (2.5)
|
157
158
|
request_store (1.5.1)
|
@@ -195,10 +196,11 @@ GEM
|
|
195
196
|
rubocop (~> 1.0)
|
196
197
|
rubocop-ast (>= 1.1.0)
|
197
198
|
ruby-progressbar (1.11.0)
|
198
|
-
sidekiq (
|
199
|
-
|
200
|
-
|
201
|
-
|
199
|
+
sidekiq (7.0.3)
|
200
|
+
concurrent-ruby (< 2)
|
201
|
+
connection_pool (>= 2.3.0)
|
202
|
+
rack (>= 2.2.4)
|
203
|
+
redis-client (>= 0.11.0)
|
202
204
|
sprockets (4.0.2)
|
203
205
|
concurrent-ruby (~> 1.0)
|
204
206
|
rack (> 1, < 3)
|
@@ -236,7 +238,7 @@ DEPENDENCIES
|
|
236
238
|
rspec (~> 3.9, >= 3.9.0)
|
237
239
|
rspec-rails (~> 5.0)
|
238
240
|
rubocop (= 1.25.1)
|
239
|
-
sidekiq (
|
241
|
+
sidekiq (> 6.0, < 8.0)
|
240
242
|
webmock (~> 3.7)
|
241
243
|
|
242
244
|
BUNDLED WITH
|
data/getaround_utils.gemspec
CHANGED
@@ -33,5 +33,5 @@ Gem::Specification.new do |gem|
|
|
33
33
|
gem.add_development_dependency 'ougai', '~> 2.0'
|
34
34
|
gem.add_development_dependency 'rails', '~> 6.0'
|
35
35
|
gem.add_development_dependency 'request_store_rails', '~> 2.0'
|
36
|
-
gem.add_development_dependency 'sidekiq', '
|
36
|
+
gem.add_development_dependency 'sidekiq', '> 6.0', "< 8.0"
|
37
37
|
end
|
@@ -13,7 +13,12 @@ module GetaroundUtils::Railties; end
|
|
13
13
|
# https://github.com/tilfin/ougai/wiki/Use-as-Rails-logger#define-a-custom-logger
|
14
14
|
class OugaiRailsLogger < Ougai::Logger
|
15
15
|
include ActiveSupport::LoggerThreadSafeLevel
|
16
|
-
include
|
16
|
+
include ActiveSupport::LoggerSilence
|
17
|
+
|
18
|
+
def initialize(*args)
|
19
|
+
super
|
20
|
+
after_initialize if respond_to?(:after_initialize) && ActiveSupport::VERSION::MAJOR < 6
|
21
|
+
end
|
17
22
|
end
|
18
23
|
|
19
24
|
# Patch for ActiveSupport::TaggedLogging
|
@@ -46,14 +51,14 @@ end
|
|
46
51
|
|
47
52
|
class GetaroundUtils::Railties::Ougai < Rails::Railtie
|
48
53
|
config.ougai_logger = OugaiRailsLogger.new($stdout)
|
49
|
-
config.ougai_logger.after_initialize if Rails::VERSION::MAJOR < 6
|
50
54
|
config.ougai_logger.formatter = GetaroundUtils::Ougai::JsonFormatter.new
|
55
|
+
|
51
56
|
config.ougai_logger.before_log = lambda do |data|
|
52
|
-
|
53
|
-
|
57
|
+
data.deep_merge!(RequestStore.store[:ougai]) \
|
58
|
+
if defined?(RequestStore) && RequestStore.store.key?(:ougai)
|
54
59
|
|
55
|
-
|
56
|
-
|
60
|
+
data.merge!(sidekiq: Thread.current[:sidekiq_context]) \
|
61
|
+
if defined?(Sidekiq) && Thread.current.key?(:sidekiq_context)
|
57
62
|
end
|
58
63
|
|
59
64
|
initializer :getaround_utils_ougai, before: :initialize_logger do |app|
|
@@ -61,16 +66,17 @@ class GetaroundUtils::Railties::Ougai < Rails::Railtie
|
|
61
66
|
end
|
62
67
|
|
63
68
|
initializer :getaround_utils_ougai_middleware do |app|
|
64
|
-
app.config.app_middleware.insert_after
|
69
|
+
app.config.app_middleware.insert_after(ActionDispatch::RequestId, OugaiRequestStoreMiddleware)
|
65
70
|
end
|
66
71
|
|
67
72
|
initializer :getaround_utils_ougai_activesupport do
|
68
|
-
ActiveSupport::TaggedLogging::Formatter.prepend
|
73
|
+
ActiveSupport::TaggedLogging::Formatter.prepend(OugaiTaggedLoggingFormatter)
|
69
74
|
end
|
70
75
|
|
71
76
|
initializer :getaround_utils_ougai_lograge do |app|
|
72
77
|
next unless defined?(Lograge)
|
73
78
|
|
79
|
+
# https://github.com/tilfin/ougai/wiki/Use-as-Rails-logger#with-lograge
|
74
80
|
app.config.lograge.logger = app.config.logger
|
75
81
|
app.config.lograge.formatter = Lograge::Formatters::Raw.new
|
76
82
|
end
|
@@ -79,9 +85,13 @@ class GetaroundUtils::Railties::Ougai < Rails::Railtie
|
|
79
85
|
next unless defined?(Sidekiq)
|
80
86
|
|
81
87
|
# https://github.com/tilfin/ougai/wiki/Customize-Sidekiq-logger
|
82
|
-
Sidekiq.
|
88
|
+
Sidekiq.configure_client do |config|
|
89
|
+
config.logger = Rails.application.config.logger
|
90
|
+
end
|
83
91
|
|
84
92
|
Sidekiq.configure_server do |config|
|
93
|
+
config.logger = Rails.application.config.logger
|
94
|
+
|
85
95
|
original_handler = config.error_handlers.shift
|
86
96
|
config.error_handlers << lambda do |ex, ctx|
|
87
97
|
if Sidekiq.logger.is_a?(Ougai::Logger)
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: getaround_utils
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.25
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Drivy
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date:
|
12
|
+
date: 2023-01-13 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bundler
|
@@ -203,16 +203,22 @@ dependencies:
|
|
203
203
|
name: sidekiq
|
204
204
|
requirement: !ruby/object:Gem::Requirement
|
205
205
|
requirements:
|
206
|
-
- - "
|
206
|
+
- - ">"
|
207
207
|
- !ruby/object:Gem::Version
|
208
208
|
version: '6.0'
|
209
|
+
- - "<"
|
210
|
+
- !ruby/object:Gem::Version
|
211
|
+
version: '8.0'
|
209
212
|
type: :development
|
210
213
|
prerelease: false
|
211
214
|
version_requirements: !ruby/object:Gem::Requirement
|
212
215
|
requirements:
|
213
|
-
- - "
|
216
|
+
- - ">"
|
214
217
|
- !ruby/object:Gem::Version
|
215
218
|
version: '6.0'
|
219
|
+
- - "<"
|
220
|
+
- !ruby/object:Gem::Version
|
221
|
+
version: '8.0'
|
216
222
|
description: Shared base utility classes for Getaround Backend Applications.
|
217
223
|
email:
|
218
224
|
- oss@drivy.com
|