applicaster-logger 0.5.2 → 0.5.3
Sign up to get free protection for your applications and to get access to all the features.
data/lib/applicaster/logger.rb
CHANGED
@@ -34,11 +34,11 @@ module Applicaster
|
|
34
34
|
Applicaster::Logger::Formatter.new(facility: "delayed_job")
|
35
35
|
end
|
36
36
|
|
37
|
-
if defined?(Sidekiq)
|
37
|
+
if defined?(Sidekiq)
|
38
38
|
Sidekiq.configure_server do |config|
|
39
39
|
config.server_middleware do |chain|
|
40
40
|
chain.remove Sidekiq::Middleware::Server::Logging
|
41
|
-
chain.add Sidekiq::Middleware::Server::LogstashLogging
|
41
|
+
chain.add Applicaster::Sidekiq::Middleware::Server::LogstashLogging
|
42
42
|
end
|
43
43
|
end
|
44
44
|
end
|
@@ -1,104 +1,106 @@
|
|
1
|
-
module
|
2
|
-
module
|
3
|
-
module
|
4
|
-
|
1
|
+
module Applicaster
|
2
|
+
module Sidekiq
|
3
|
+
module Middleware
|
4
|
+
module Server
|
5
|
+
class LogstashLogging
|
5
6
|
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
7
|
+
def call(worker, item, queue)
|
8
|
+
Sidekiq::Logging.with_context("#{worker.class.to_s} JID-#{item['jid']}") do
|
9
|
+
begin
|
10
|
+
logger.info(filter_fields({
|
11
|
+
message: "Start: #{worker.class.to_s} JID-#{item['jid']}",
|
12
|
+
jid: item['jid'],
|
13
|
+
pid: pid,
|
14
|
+
tid: tid,
|
15
|
+
context: context,
|
16
|
+
worker: worker.class.to_s,
|
17
|
+
queue: queue,
|
18
|
+
args: item['args'],
|
19
|
+
latency: Sidekiq::Job.new(Sidekiq.dump_json(item)).latency,
|
20
|
+
memory: memory
|
21
|
+
}))
|
21
22
|
|
22
|
-
|
23
|
+
start = Time.now
|
23
24
|
|
24
|
-
|
25
|
+
yield # Pass the torch
|
25
26
|
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
27
|
+
logger.info(filter_fields({
|
28
|
+
message: "Done: #{worker.class.to_s} JID-#{item['jid']}",
|
29
|
+
jid: item['jid'],
|
30
|
+
pid: pid,
|
31
|
+
tid: tid,
|
32
|
+
context: context,
|
33
|
+
worker: worker.class.to_s,
|
34
|
+
queue: queue,
|
35
|
+
args: item['args'],
|
36
|
+
runtime: elapsed(start),
|
37
|
+
memory: memory
|
38
|
+
}))
|
39
|
+
rescue Exception => e
|
40
|
+
logger.error(filter_fields({
|
41
|
+
message: "Fail: #{worker.class.to_s} JID-#{item['jid']}",
|
42
|
+
jid: item['jid'],
|
43
|
+
pid: pid,
|
44
|
+
tid: tid,
|
45
|
+
context: context,
|
46
|
+
worker: worker.class.to_s,
|
47
|
+
queue: queue,
|
48
|
+
args: item['args'],
|
49
|
+
runtime: elapsed(start),
|
50
|
+
exception_class: e.class.to_s,
|
51
|
+
exception_message: e.message,
|
52
|
+
backtrace: e.backtrace.join("\n"),
|
53
|
+
memory: memory
|
54
|
+
}))
|
54
55
|
|
55
|
-
|
56
|
+
raise e
|
57
|
+
end
|
56
58
|
end
|
57
59
|
end
|
58
|
-
end
|
59
60
|
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
61
|
+
def logger
|
62
|
+
@logger ||=
|
63
|
+
begin
|
64
|
+
applicaster_logger = ::Rails.application.config.applicaster_logger
|
65
|
+
logger = LogStashLogger.new(applicaster_logger.logstash_config)
|
66
|
+
logger.level = applicaster_logger.level
|
67
|
+
logger.formatter = Applicaster::Logger::Formatter.new(facility: "sidekiq")
|
68
|
+
logger
|
69
|
+
end
|
70
|
+
end
|
70
71
|
|
71
|
-
|
72
|
+
private
|
72
73
|
|
73
|
-
|
74
|
-
|
75
|
-
|
74
|
+
def pid
|
75
|
+
::Process.pid
|
76
|
+
end
|
76
77
|
|
77
|
-
|
78
|
-
|
79
|
-
|
78
|
+
def tid
|
79
|
+
::Thread.current.object_id.to_s(36)
|
80
|
+
end
|
80
81
|
|
81
|
-
|
82
|
-
|
83
|
-
|
82
|
+
def context
|
83
|
+
::Thread.current[:sidekiq_context]
|
84
|
+
end
|
84
85
|
|
85
|
-
|
86
|
-
|
87
|
-
|
86
|
+
def memory
|
87
|
+
`ps -o rss= -p #{::Process.pid}`.chomp.to_i
|
88
|
+
end
|
88
89
|
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
90
|
+
def elapsed(start)
|
91
|
+
return nil if start.nil?
|
92
|
+
(Time.now - start).to_f.round(3)
|
93
|
+
end
|
93
94
|
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
95
|
+
def filter_fields(data)
|
96
|
+
data.each do |key, val|
|
97
|
+
if val.is_a?(String) && val.length > 32766 # max message length
|
98
|
+
data[key] = "[omitted; length = #{val.length}, max = 32766]"
|
99
|
+
end
|
98
100
|
end
|
99
|
-
end
|
100
101
|
|
101
|
-
|
102
|
+
data
|
103
|
+
end
|
102
104
|
end
|
103
105
|
end
|
104
106
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: applicaster-logger
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.3
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2015-05-
|
12
|
+
date: 2015-05-25 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: logstash-logger
|
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
110
110
|
version: '0'
|
111
111
|
segments:
|
112
112
|
- 0
|
113
|
-
hash:
|
113
|
+
hash: -2584598253034463662
|
114
114
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
115
115
|
none: false
|
116
116
|
requirements:
|
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
119
119
|
version: '0'
|
120
120
|
segments:
|
121
121
|
- 0
|
122
|
-
hash:
|
122
|
+
hash: -2584598253034463662
|
123
123
|
requirements: []
|
124
124
|
rubyforge_project:
|
125
125
|
rubygems_version: 1.8.23
|