logstasher 0.8.0 → 0.8.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/logstasher.rb +25 -7
- data/lib/logstasher/active_record/log_subscriber.rb +5 -4
- data/lib/logstasher/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a6c6fc0a02454a4b8dba0d6b7382aa9e9f4472fb
|
4
|
+
data.tar.gz: 94d05b1358dd0bc32e2c629a8d9d1c041664a8f1
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e9187bae7a6a01d58601d8beacafeb6cd6624d750d12c928c4450f6e3aa89eb6792fa5634161e26be79dac1a72a6e014f2d4585247ff41184ae35ec1a34cec40
|
7
|
+
data.tar.gz: fb2dcf41ab0cf0f13a083d6a27c8eda0a9d5667917d0bd9ab2c9e918f272c35fdbef0f2208b1f5ddfca16ec56b9dfbea9c807c474ff27889b87077006ed3a6de
|
data/lib/logstasher.rb
CHANGED
@@ -151,15 +151,33 @@ module LogStasher
|
|
151
151
|
Thread.current[:logstasher_custom_fields] = val
|
152
152
|
end
|
153
153
|
|
154
|
-
|
154
|
+
# Log an arbitrary message.
|
155
|
+
#
|
156
|
+
# Usually invoked by the level-based wrapper methods defined below.
|
157
|
+
#
|
158
|
+
# Examples
|
159
|
+
#
|
160
|
+
# LogStasher.info("message")
|
161
|
+
# LogStasher.info("message", tags:"tag1")
|
162
|
+
# LogStasher.info("message", tags:["tag1", "tag2"])
|
163
|
+
# LogStasher.info("message", timing:1234)
|
164
|
+
# LogStasher.info(custom1:"yes", custom2:"no")
|
165
|
+
def log(severity, message, additional_fields={})
|
155
166
|
if self.logger && self.logger.send("#{severity}?")
|
167
|
+
|
156
168
|
data = {'level' => severity}
|
157
|
-
if
|
158
|
-
data.merge!(
|
169
|
+
if message.respond_to?(:to_hash)
|
170
|
+
data.merge!(message.to_hash)
|
159
171
|
else
|
160
|
-
data['message'] =
|
172
|
+
data['message'] = message
|
161
173
|
end
|
162
|
-
|
174
|
+
|
175
|
+
# tags get special handling
|
176
|
+
tags = Array(additional_fields.delete(:tags) || 'log')
|
177
|
+
|
178
|
+
data.merge!(additional_fields)
|
179
|
+
self.logger << build_logstash_event(data, tags).to_json + "\n"
|
180
|
+
|
163
181
|
end
|
164
182
|
end
|
165
183
|
|
@@ -189,8 +207,8 @@ module LogStasher
|
|
189
207
|
|
190
208
|
%w( fatal error warn info debug unknown ).each do |severity|
|
191
209
|
eval <<-EOM, nil, __FILE__, __LINE__ + 1
|
192
|
-
def #{severity}(
|
193
|
-
self.log(:#{severity},
|
210
|
+
def #{severity}(message=nil, additional_fields={})
|
211
|
+
self.log(:#{severity}, message, additional_fields)
|
194
212
|
end
|
195
213
|
EOM
|
196
214
|
end
|
@@ -5,8 +5,9 @@ module LogStasher
|
|
5
5
|
module ActiveRecord
|
6
6
|
class LogSubscriber < ::ActiveRecord::LogSubscriber
|
7
7
|
def identity(event)
|
8
|
-
|
9
|
-
|
8
|
+
lsevent = logstash_event(event)
|
9
|
+
if logger && lsevent
|
10
|
+
logger << lsevent.to_json + "\n"
|
10
11
|
end
|
11
12
|
end
|
12
13
|
alias :sql :identity
|
@@ -28,8 +29,8 @@ module LogStasher
|
|
28
29
|
data.merge! request_context
|
29
30
|
data.merge! extract_custom_fields(data)
|
30
31
|
|
31
|
-
tags = ['request']
|
32
|
-
tags.push('exception') if
|
32
|
+
tags = [ 'request' ]
|
33
|
+
tags.push('exception') if data[:exception]
|
33
34
|
LogStasher.build_logstash_event(data, tags)
|
34
35
|
end
|
35
36
|
|
data/lib/logstasher/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: logstasher
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.8.
|
4
|
+
version: 0.8.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Shadab Ahmed
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-11-02 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: logstash-event
|