fluent-plugin-concat 1.0.0 → 2.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +0 -1
- data/Appraisals +0 -5
- data/NEWS.md +0 -4
- data/fluent-plugin-concat.gemspec +2 -2
- data/lib/fluent/plugin/filter_concat.rb +16 -25
- metadata +5 -6
- data/gemfiles/fluentd_v0.12.gemfile +0 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7e4fdeffac4ac9291bad2385962da8089760784d
|
4
|
+
data.tar.gz: 17430d2ba4129c6264927485021fd62db942a1af
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 59d1efd15541072956e7628258acbe0cb60c23b995eb5bd12f4239c17eb5a1d2716e0cc13809d26b1672d0c2be1fb5cb066e1d79bada1481dfd58a734aef9a3a
|
7
|
+
data.tar.gz: 6b88b538cb2650cdbf6d848aa9f2238e5bb1e265422583305a9a8e90b22cade41122f8a7a338e008e9e9f1b8fb639b177754c1547666a26177791d07a9d90cf2
|
data/.travis.yml
CHANGED
data/Appraisals
CHANGED
data/NEWS.md
CHANGED
@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
|
4
4
|
|
5
5
|
Gem::Specification.new do |spec|
|
6
6
|
spec.name = "fluent-plugin-concat"
|
7
|
-
spec.version = "
|
7
|
+
spec.version = "2.0.0"
|
8
8
|
spec.authors = ["Kenji Okimoto"]
|
9
9
|
spec.email = ["okimoto@clear-code.com"]
|
10
10
|
|
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
|
|
16
16
|
spec.files = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
|
17
17
|
spec.require_paths = ["lib"]
|
18
18
|
|
19
|
-
spec.add_runtime_dependency "fluentd", "
|
19
|
+
spec.add_runtime_dependency "fluentd", ">= 0.14.0"
|
20
20
|
spec.add_development_dependency "bundler", "~> 1.11"
|
21
21
|
spec.add_development_dependency "rake", "~> 10.0"
|
22
22
|
spec.add_development_dependency "test-unit", ">= 3.1.0"
|
@@ -1,6 +1,10 @@
|
|
1
|
-
|
1
|
+
require 'fluent/plugin/filter'
|
2
|
+
|
3
|
+
module Fluent::Plugin
|
2
4
|
class ConcatFilter < Filter
|
3
|
-
Plugin.register_filter("concat", self)
|
5
|
+
Fluent::Plugin.register_filter("concat", self)
|
6
|
+
|
7
|
+
helpers :timer
|
4
8
|
|
5
9
|
desc "The key for part of multiline log"
|
6
10
|
config_param :key, :string, required: true
|
@@ -35,10 +39,10 @@ module Fluent
|
|
35
39
|
super
|
36
40
|
|
37
41
|
if @n_lines && @multiline_start_regexp
|
38
|
-
raise ConfigError, "n_lines and multiline_start_regexp are exclusive"
|
42
|
+
raise Fluent::ConfigError, "n_lines and multiline_start_regexp are exclusive"
|
39
43
|
end
|
40
44
|
if @n_lines.nil? && @multiline_start_regexp.nil?
|
41
|
-
raise ConfigError, "Either n_lines or multiline_start_regexp is required"
|
45
|
+
raise Fluent::ConfigError, "Either n_lines or multiline_start_regexp is required"
|
42
46
|
end
|
43
47
|
|
44
48
|
@mode = nil
|
@@ -57,24 +61,22 @@ module Fluent
|
|
57
61
|
def start
|
58
62
|
super
|
59
63
|
@finished = false
|
60
|
-
|
61
|
-
timer = TimeoutTimer.new(1, method(:on_timer))
|
62
|
-
@loop.attach(timer)
|
63
|
-
@thread = Thread.new(@loop, &:run)
|
64
|
+
timer_execute(:filter_concat_timer, 1, &method(:on_timer))
|
64
65
|
end
|
65
66
|
|
66
67
|
def shutdown
|
67
68
|
super
|
68
69
|
@finished = true
|
69
|
-
@loop.watchers.each(&:detach)
|
70
|
-
@loop.stop
|
71
|
-
@thread.join
|
72
70
|
flush_remaining_buffer
|
73
71
|
end
|
74
72
|
|
75
73
|
def filter_stream(tag, es)
|
76
|
-
new_es = MultiEventStream.new
|
74
|
+
new_es = Fluent::MultiEventStream.new
|
77
75
|
es.each do |time, record|
|
76
|
+
if /\Afluent\.(?:trace|debug|info|warn|error|fatal)\z/ =~ tag
|
77
|
+
new_es.add(time, record)
|
78
|
+
next
|
79
|
+
end
|
78
80
|
begin
|
79
81
|
flushed_es = process(tag, time, record)
|
80
82
|
unless flushed_es.empty?
|
@@ -99,7 +101,7 @@ module Fluent
|
|
99
101
|
end
|
100
102
|
|
101
103
|
def process(tag, time, record)
|
102
|
-
new_es = MultiEventStream.new
|
104
|
+
new_es = Fluent::MultiEventStream.new
|
103
105
|
if @stream_identity_key
|
104
106
|
stream_identity = "#{tag}:#{record[@stream_identity_key]}"
|
105
107
|
else
|
@@ -210,22 +212,11 @@ module Fluent
|
|
210
212
|
|
211
213
|
def handle_timeout_error(tag, time, record, message)
|
212
214
|
if @timeout_label
|
213
|
-
label = Engine.root_agent.find_label(@timeout_label)
|
215
|
+
label = Fluent::Engine.root_agent.find_label(@timeout_label)
|
214
216
|
label.event_router.emit(tag, time, record)
|
215
217
|
else
|
216
218
|
router.emit_error_event(tag, time, record, TimeoutError.new(message))
|
217
219
|
end
|
218
220
|
end
|
219
|
-
|
220
|
-
class TimeoutTimer < Coolio::TimerWatcher
|
221
|
-
def initialize(interval, callback)
|
222
|
-
super(interval, true)
|
223
|
-
@callback = callback
|
224
|
-
end
|
225
|
-
|
226
|
-
def on_timer
|
227
|
-
@callback.call
|
228
|
-
end
|
229
|
-
end
|
230
221
|
end
|
231
222
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fluent-plugin-concat
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 2.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Kenji Okimoto
|
@@ -14,16 +14,16 @@ dependencies:
|
|
14
14
|
name: fluentd
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- - "
|
17
|
+
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 0.
|
19
|
+
version: 0.14.0
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- - "
|
24
|
+
- - ">="
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 0.
|
26
|
+
version: 0.14.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: bundler
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -111,7 +111,6 @@ files:
|
|
111
111
|
- README.md
|
112
112
|
- Rakefile
|
113
113
|
- fluent-plugin-concat.gemspec
|
114
|
-
- gemfiles/fluentd_v0.12.gemfile
|
115
114
|
- gemfiles/fluentd_v0.14.gemfile
|
116
115
|
- lib/fluent/plugin/filter_concat.rb
|
117
116
|
homepage: https://github.com/okkez/fluent-plugin-concat
|