juan_pelota 2.0.0 → 2.0.1
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 +4 -4
- checksums.yaml.gz.sig +5 -0
- data.tar.gz.sig +0 -0
- data/Rakefile +2 -0
- data/lib/juan_pelota.rb +2 -0
- data/lib/juan_pelota/configuration.rb +3 -1
- data/lib/juan_pelota/logger.rb +14 -11
- data/lib/juan_pelota/middlewares/logging.rb +7 -6
- data/lib/juan_pelota/version.rb +3 -1
- data/spec/juan_pelota/logger_spec.rb +37 -35
- data/spec/spec_helper.rb +2 -0
- metadata +29 -8
- metadata.gz.sig +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: cd27b79a23fdec5d16bbd12b5241ae6331a64d2a
|
4
|
+
data.tar.gz: 9287f5a33238f68b15e848d7d4b5ed6b8d213dea
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: abc44194707cfa4b5126d674236c43e436224df3abf8cba92bae76a800ddd015866e48da86d0cc355613d5d4852c93927f6e6a3be2a22026285a05aa7c8769c3
|
7
|
+
data.tar.gz: 33060a765de9709e9ecc7c259123793246bdf6c03599ddaa24ff003b51e653053d88045a9258fc366c0af0971d7712436ee9e6e20ffc9ae04d986c191c0d7428
|
checksums.yaml.gz.sig
ADDED
data.tar.gz.sig
ADDED
Binary file
|
data/Rakefile
CHANGED
data/lib/juan_pelota.rb
CHANGED
data/lib/juan_pelota/logger.rb
CHANGED
@@ -1,9 +1,12 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'sidekiq/logging'
|
1
4
|
require 'juan_pelota/version'
|
2
5
|
require 'juan_pelota'
|
3
6
|
require 'json'
|
4
7
|
|
5
8
|
module JuanPelota
|
6
|
-
class Logger < Sidekiq::Logging::Pretty
|
9
|
+
class Logger < ::Sidekiq::Logging::Pretty
|
7
10
|
IGNORABLE_STATUSES = %w{start done queueing}.freeze
|
8
11
|
|
9
12
|
attr_accessor :severity,
|
@@ -38,6 +41,14 @@ class Logger < Sidekiq::Logging::Pretty
|
|
38
41
|
}.to_json + "\n"
|
39
42
|
end
|
40
43
|
|
44
|
+
def self.pid
|
45
|
+
::Process.pid
|
46
|
+
end
|
47
|
+
|
48
|
+
def self.tid
|
49
|
+
::Thread.current.object_id.to_s(36)
|
50
|
+
end
|
51
|
+
|
41
52
|
private
|
42
53
|
|
43
54
|
def raw_message
|
@@ -53,11 +64,11 @@ class Logger < Sidekiq::Logging::Pretty
|
|
53
64
|
elsif @raw_message.respond_to?(:match) &&
|
54
65
|
@raw_message.match(/:\d+:in\s`/)
|
55
66
|
{
|
56
|
-
'message' => @raw_message.lines.first(10).map(&:chomp)
|
67
|
+
'message' => @raw_message.lines.first(10).map(&:chomp),
|
57
68
|
}
|
58
69
|
else
|
59
70
|
{
|
60
|
-
'message' => @raw_message
|
71
|
+
'message' => @raw_message,
|
61
72
|
}
|
62
73
|
end
|
63
74
|
end
|
@@ -90,14 +101,6 @@ class Logger < Sidekiq::Logging::Pretty
|
|
90
101
|
raw_message['class']
|
91
102
|
end
|
92
103
|
|
93
|
-
def self.pid
|
94
|
-
::Process.pid
|
95
|
-
end
|
96
|
-
|
97
|
-
def self.tid
|
98
|
-
::Thread.current.object_id.to_s(36)
|
99
|
-
end
|
100
|
-
|
101
104
|
def config
|
102
105
|
Configuration.instance
|
103
106
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module JuanPelota
|
2
4
|
module Middlewares
|
3
5
|
class Logging
|
@@ -54,18 +56,17 @@ class Logging
|
|
54
56
|
end
|
55
57
|
|
56
58
|
def logger
|
57
|
-
Sidekiq.logger
|
59
|
+
::Sidekiq.logger
|
58
60
|
end
|
59
61
|
|
60
62
|
def filtered_arguments(args)
|
61
63
|
return if args.nil?
|
62
64
|
|
63
|
-
@filtered_arguments ||=
|
64
|
-
|
65
|
-
value = filtered_arguments(value) if value.is_a? Hash
|
65
|
+
@filtered_arguments ||= args.each_with_object({}) do |(key, value), filtered_hash|
|
66
|
+
value = filtered_arguments(value) if value.is_a? Hash
|
66
67
|
|
67
|
-
|
68
|
-
|
68
|
+
filtered_hash[key] = value unless config.filtered_arguments.include? key
|
69
|
+
end
|
69
70
|
end
|
70
71
|
|
71
72
|
private
|
data/lib/juan_pelota/version.rb
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'spec_helper'
|
2
4
|
|
3
5
|
module JuanPelota
|
@@ -56,31 +58,31 @@ describe Logger do
|
|
56
58
|
)
|
57
59
|
end
|
58
60
|
|
59
|
-
# rubocop:disable Metrics/LineLength
|
61
|
+
# rubocop:disable Metrics/LineLength, RSpec/ExampleLength
|
60
62
|
it 'take message as a string and can detect if its a backtrace',
|
61
63
|
:time_mock do
|
62
64
|
|
63
|
-
backtrace =
|
64
|
-
/Users/
|
65
|
-
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/processor.rb:75:in `execute_job'
|
66
|
-
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/processor.rb:52:in `block (2 levels) in process'
|
67
|
-
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/chain.rb:127:in `block in invoke'
|
68
|
-
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/honeybadger-2.0.11/lib/honeybadger/plugins/sidekiq.rb:11:in `block in call'
|
69
|
-
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/honeybadger-2.0.11/lib/honeybadger/trace.rb:62:in `instrument'
|
70
|
-
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/honeybadger-2.0.11/lib/honeybadger/trace.rb:18:in `instrument'
|
71
|
-
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/honeybadger-2.0.11/lib/honeybadger/plugins/sidekiq.rb:10:in `call'
|
72
|
-
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/chain.rb:129:in `block in invoke'
|
73
|
-
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-unique-jobs-3.0.14/lib/sidekiq_unique_jobs/middleware/server/unique_jobs.rb:16:in `call'
|
74
|
-
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/chain.rb:129:in `block in invoke'
|
75
|
-
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/server/active_record.rb:6:in `call'
|
76
|
-
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/chain.rb:129:in `block in invoke'
|
77
|
-
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/server/retry_jobs.rb:74:in `call'
|
78
|
-
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/chain.rb:129:in `block in invoke'
|
79
|
-
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-failures-0.4.4/lib/sidekiq/failures/middleware.rb:9:in `call'
|
80
|
-
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/chain.rb:129:in `block in invoke'
|
81
|
-
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/chain.rb:129:in `block in invoke'
|
82
|
-
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-skylight-0.0.4/lib/sidekiq/skylight/server_middleware.rb:8:in `block in call'
|
83
|
-
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/skylight-0.6.0/lib/skylight/core.rb:70:in `trace'
|
65
|
+
backtrace = <<~HEREDOC
|
66
|
+
/Users/myuser/Projects/foo/bar_baz/app/workers/bar_baz/workers/process_item.rb:50:in `perform'
|
67
|
+
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/processor.rb:75:in `execute_job'
|
68
|
+
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/processor.rb:52:in `block (2 levels) in process'
|
69
|
+
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/chain.rb:127:in `block in invoke'
|
70
|
+
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/honeybadger-2.0.11/lib/honeybadger/plugins/sidekiq.rb:11:in `block in call'
|
71
|
+
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/honeybadger-2.0.11/lib/honeybadger/trace.rb:62:in `instrument'
|
72
|
+
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/honeybadger-2.0.11/lib/honeybadger/trace.rb:18:in `instrument'
|
73
|
+
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/honeybadger-2.0.11/lib/honeybadger/plugins/sidekiq.rb:10:in `call'
|
74
|
+
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/chain.rb:129:in `block in invoke'
|
75
|
+
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-unique-jobs-3.0.14/lib/sidekiq_unique_jobs/middleware/server/unique_jobs.rb:16:in `call'
|
76
|
+
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/chain.rb:129:in `block in invoke'
|
77
|
+
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/server/active_record.rb:6:in `call'
|
78
|
+
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/chain.rb:129:in `block in invoke'
|
79
|
+
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/server/retry_jobs.rb:74:in `call'
|
80
|
+
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/chain.rb:129:in `block in invoke'
|
81
|
+
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-failures-0.4.4/lib/sidekiq/failures/middleware.rb:9:in `call'
|
82
|
+
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/chain.rb:129:in `block in invoke'
|
83
|
+
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/chain.rb:129:in `block in invoke'
|
84
|
+
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-skylight-0.0.4/lib/sidekiq/skylight/server_middleware.rb:8:in `block in call'
|
85
|
+
/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/skylight-0.6.0/lib/skylight/core.rb:70:in `trace'
|
84
86
|
HEREDOC
|
85
87
|
|
86
88
|
json = JuanPelota::Logger.new.call('high',
|
@@ -93,20 +95,20 @@ describe Logger do
|
|
93
95
|
expect(json_data).to include(
|
94
96
|
'@status' => 'dead',
|
95
97
|
'@message' => [
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
98
|
+
"/Users/myuser/Projects/foo/bar_baz/app/workers/bar_baz/workers/process_item.rb:50:in `perform'",
|
99
|
+
"/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/processor.rb:75:in `execute_job'",
|
100
|
+
"/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/processor.rb:52:in `block (2 levels) in process'",
|
101
|
+
"/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/chain.rb:127:in `block in invoke'",
|
102
|
+
"/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/honeybadger-2.0.11/lib/honeybadger/plugins/sidekiq.rb:11:in `block in call'",
|
103
|
+
"/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/honeybadger-2.0.11/lib/honeybadger/trace.rb:62:in `instrument'",
|
104
|
+
"/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/honeybadger-2.0.11/lib/honeybadger/trace.rb:18:in `instrument'",
|
105
|
+
"/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/honeybadger-2.0.11/lib/honeybadger/plugins/sidekiq.rb:10:in `call'",
|
106
|
+
"/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-3.4.1/lib/sidekiq/middleware/chain.rb:129:in `block in invoke'",
|
107
|
+
"/usr/local/var/rbenv/versions/2.2.2/lib/ruby/gems/2.2.0/gems/sidekiq-unique-jobs-3.0.14/lib/sidekiq_unique_jobs/middleware/server/unique_jobs.rb:16:in `call'",
|
108
|
+
],
|
107
109
|
)
|
108
110
|
end
|
109
|
-
# rubocop:enable Metrics/LineLength
|
111
|
+
# rubocop:enable Metrics/LineLength, RSpec/ExampleLength
|
110
112
|
|
111
113
|
it 'set the status to dead and returns a nil worker if it gets a string without ' \
|
112
114
|
'"queueing" in the message',
|
@@ -123,7 +125,7 @@ describe Logger do
|
|
123
125
|
'@status' => 'dead',
|
124
126
|
'@message' => 'My Message',
|
125
127
|
'@fields' => include(
|
126
|
-
'worker'
|
128
|
+
'worker' => nil,
|
127
129
|
),
|
128
130
|
)
|
129
131
|
end
|
data/spec/spec_helper.rb
CHANGED
metadata
CHANGED
@@ -1,15 +1,37 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: juan_pelota
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- thekompanee
|
8
|
-
- goodscout
|
9
8
|
autorequire:
|
10
9
|
bindir: bin
|
11
|
-
cert_chain:
|
12
|
-
|
10
|
+
cert_chain:
|
11
|
+
- |
|
12
|
+
-----BEGIN CERTIFICATE-----
|
13
|
+
MIIDrjCCApagAwIBAgIBATANBgkqhkiG9w0BAQUFADBOMRowGAYDVQQDDBFhY2Nv
|
14
|
+
dW50c19ydWJ5Z2VtczEbMBkGCgmSJomT8ixkARkWC3RoZWtvbXBhbmVlMRMwEQYK
|
15
|
+
CZImiZPyLGQBGRYDY29tMB4XDTE2MDQyNDAyNTEyM1oXDTE3MDQyNDAyNTEyM1ow
|
16
|
+
TjEaMBgGA1UEAwwRYWNjb3VudHNfcnVieWdlbXMxGzAZBgoJkiaJk/IsZAEZFgt0
|
17
|
+
aGVrb21wYW5lZTETMBEGCgmSJomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEB
|
18
|
+
BQADggEPADCCAQoCggEBANklzdaVeHtut6LTe/hrl6Krz2Z60InEbNb+TMG43tww
|
19
|
+
jBpWZrdU/SBkR3EYbTAQv/yGTuMHoVKGK2kDlFvdofW2hX0d14qPyYJUNYt+7VWE
|
20
|
+
3UhPSxw1i6MxeU1QwfkIyaN8A5lj0225+rwI/mbplv+lSXPlJEroCQ9EfniZD4jL
|
21
|
+
URlrHWl/UejcQ32C1IzBwth3+nacrO1197v5nSdozFzQwm4groaggXn9F/WpThu+
|
22
|
+
MhcE4bfttwEjAfU3zAThyzOFoVPpACP+SwOuyPJSl02+9BiwzeAnFJDfge7+rsd5
|
23
|
+
64W/VzBIklEKUZMmxZwr5DwpSXLrknBDtHLABG9Nr3cCAwEAAaOBljCBkzAJBgNV
|
24
|
+
HRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUP7v0f/qfa0LMrhkzHRI3l10X
|
25
|
+
LYIwLAYDVR0RBCUwI4EhYWNjb3VudHMrcnVieWdlbXNAdGhla29tcGFuZWUuY29t
|
26
|
+
MCwGA1UdEgQlMCOBIWFjY291bnRzK3J1YnlnZW1zQHRoZWtvbXBhbmVlLmNvbTAN
|
27
|
+
BgkqhkiG9w0BAQUFAAOCAQEASqdfJKMun1twosHfvdDH7Vgrb5VqX28qJ6MgnhjF
|
28
|
+
p+3HYTjYo/KMQqu78TegUFO5xQ4oumU0FTXADW0ryXZvUGV74M0zwqpFqeo8onII
|
29
|
+
lsVsWdMCLZS21M0uCQmcV+OQMNxL8jV3c0D3x9Srr9yO4oamW3seIdb+b9RfhmV2
|
30
|
+
ryr+NH8U/4xgzdJ4hWV4qk93nwigp4lwJ4u93XJ7Cdyw7itvaEPnn8HpCfzsiLcw
|
31
|
+
QwSfDGz6+zsImi5N3UT71+mk7YcviQSgvMRl3VkAv8MZ6wcJ5SQRpf9w0OeFH6Ln
|
32
|
+
nNbCoHiYeXX/lz/M6AIbxDIZZTwxcyvF7bdrQ2fbH5MsfQ==
|
33
|
+
-----END CERTIFICATE-----
|
34
|
+
date: 2017-03-31 00:00:00.000000000 Z
|
13
35
|
dependencies:
|
14
36
|
- !ruby/object:Gem::Dependency
|
15
37
|
name: sidekiq
|
@@ -82,7 +104,7 @@ dependencies:
|
|
82
104
|
- !ruby/object:Gem::Version
|
83
105
|
version: 0.7.1
|
84
106
|
description: ''
|
85
|
-
email:
|
107
|
+
email: info@thekompanee.com
|
86
108
|
executables: []
|
87
109
|
extensions: []
|
88
110
|
extra_rdoc_files: []
|
@@ -97,7 +119,7 @@ files:
|
|
97
119
|
- lib/juan_pelota/version.rb
|
98
120
|
- spec/juan_pelota/logger_spec.rb
|
99
121
|
- spec/spec_helper.rb
|
100
|
-
homepage: https://github.com/
|
122
|
+
homepage: https://github.com/thekompanee/juan_pelota
|
101
123
|
licenses:
|
102
124
|
- MIT
|
103
125
|
metadata: {}
|
@@ -117,11 +139,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
117
139
|
version: '0'
|
118
140
|
requirements: []
|
119
141
|
rubyforge_project:
|
120
|
-
rubygems_version: 2.
|
142
|
+
rubygems_version: 2.6.11
|
121
143
|
signing_key:
|
122
144
|
specification_version: 4
|
123
145
|
summary: Log Sidekiq messages in JSON format
|
124
146
|
test_files:
|
125
147
|
- spec/juan_pelota/logger_spec.rb
|
126
148
|
- spec/spec_helper.rb
|
127
|
-
has_rdoc:
|
metadata.gz.sig
ADDED
Binary file
|