Skip to content

Commit 4b874be

Browse files
smallcreepsmallcreep
committed
Different formatting
1 parent c929387 commit 4b874be

File tree

2 files changed

+33
-36
lines changed

2 files changed

+33
-36
lines changed

‎lib/fluent/plugin/filter_record_modifier.rb‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,33 @@ class Plugin::RecordModifierFilter < Plugin::Filter
88
desc: <<-DESC
99
Prepare values for filtering in configure phase. Prepared values can be used in <record>.
1010
You can write any ruby code.
11-
DESC
11+
DESC
1212
config_param :char_encoding, :string, default: nil,
1313
desc: <<-DESC
1414
Fluentd including some plugins treats the logs as a BINARY by default to forward.
1515
But an user sometimes processes the logs depends on their requirements,
1616
e.g. handling char encoding correctly.
1717
In more detail, please refer this section:
1818
https://github.com/repeatedly/fluent-plugin-record-modifier#char_encoding.
19-
DESC
19+
DESC
2020
config_param :remove_keys, :string, default: nil,
2121
desc: <<-DESC
2222
The logs include needless record keys in some cases.
2323
You can remove it by using `remove_keys` parameter.
2424
This option is exclusive with `whitelist_keys`.
25-
DESC
25+
DESC
2626

2727
config_param :whitelist_keys, :string, default: nil,
2828
desc: <<-DESC
2929
Specify `whitelist_keys` to remove all unexpected keys and values from events.
3030
Modified events will have only specified keys (if exist in original events).
3131
This option is exclusive with `remove_keys`.
32-
DESC
32+
DESC
3333

3434
config_param :replace, :bool, default: false,
3535
desc: <<-DESC
3636
Boolean flag to enable replace function. Default is false.
37-
DESC
37+
DESC
3838

3939
def configure(conf)
4040
super
@@ -132,15 +132,15 @@ def set_encoding(value)
132132
if value.is_a?(String)
133133
value.force_encoding(@from_enc)
134134
elsif value.is_a?(Hash)
135-
value.each_pair {|k, v|
135+
value.each_pair { |k, v|
136136
if v.frozen? && v.is_a?(String)
137137
value[k] = set_encoding(v.dup)
138138
else
139139
set_encoding(v)
140140
end
141141
}
142142
elsif value.is_a?(Array)
143-
value.each {|v| set_encoding(v)}
143+
value.each { |v| set_encoding(v) }
144144
else
145145
value
146146
end
@@ -151,15 +151,15 @@ def convert_encoding(value)
151151
value.force_encoding(@from_enc) if value.encoding == Encoding::BINARY
152152
value.encode!(@to_enc, @from_enc, :invalid => :replace, :undef => :replace)
153153
elsif value.is_a?(Hash)
154-
value.each_pair {|k, v|
154+
value.each_pair { |k, v|
155155
if v.frozen? && v.is_a?(String)
156156
value[k] = convert_encoding(v.dup)
157157
else
158158
convert_encoding(v)
159159
end
160160
}
161161
elsif value.is_a?(Array)
162-
value.each {|v| convert_encoding(v)}
162+
value.each { |v| convert_encoding(v) }
163163
else
164164
value
165165
end
@@ -168,7 +168,7 @@ def convert_encoding(value)
168168
HOSTNAME_PLACEHOLDERS = %W(__HOSTNAME__ ${hostname})
169169

170170
def check_config_placeholders(k, v)
171-
HOSTNAME_PLACEHOLDERS.each {|ph|
171+
HOSTNAME_PLACEHOLDERS.each { |ph|
172172
if v.include?(ph)
173173
raise ConfigError, %!#{ph} placeholder in #{k} is removed. Use "\#{Socket.gethostname}" instead.!
174174
end
@@ -183,10 +183,7 @@ def initialize(param_key, param_value, prepare_value)
183183
# Use class_eval with string instead of define_method for performance.
184184
# It can't share instructions but this is 2x+ faster than define_method in filter case.
185185
# Refer: http://tenderlovemaking.com/2013/03/03/dynamic_method_definitions.html
186-
(
187-
class << self;
188-
self;
189-
end).class_eval <<-EORUBY, __FILE__, __LINE__ + 1
186+
(class << self; self; end).class_eval <<-EORUBY, __FILE__, __LINE__ + 1
190187
def expand(tag, time, record, tag_parts)
191188
#{__str_eval_code__}
192189
end

‎test/test_filter_record_modifier.rb‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def test_configure
3434
d = create_driver
3535
map = d.instance.instance_variable_get(:@map)
3636

37-
map.each_pair {|k, v|
37+
map.each_pair { |k, v|
3838
assert v.is_a?(Fluent::Plugin::RecordModifierFilter::DynamicExpander)
3939
}
4040
end
@@ -49,9 +49,9 @@ def test_format
4949

5050
mapped = {'gen_host' => get_hostname, 'foo' => 'bar', 'included_tag' => @tag, 'tag_wrap' => "-#{@tag.split('.')[0]}-#{@tag.split('.')[1]}-"}
5151
assert_equal [
52-
{"a" => 1}.merge(mapped),
53-
{"a" => 2}.merge(mapped),
54-
], d.filtered.map {|e| e.last}
52+
{"a" => 1}.merge(mapped),
53+
{"a" => 2}.merge(mapped),
54+
], d.filtered.map { |e| e.last }
5555
end
5656

5757
def test_set_char_encoding
@@ -61,15 +61,15 @@ def test_set_char_encoding
6161

6262
d.run(default_tag: @tag) do
6363
d.feed("k" => 'v'.force_encoding('BINARY'))
64-
d.feed("k" => %w(v ビ).map {|v| v.force_encoding('BINARY')})
64+
d.feed("k" => %w(v ビ).map{|v| v.force_encoding('BINARY')})
6565
d.feed("k" => {"l" => 'ビ'.force_encoding('BINARY')})
6666
end
6767

6868
assert_equal [
69-
{"k" => 'v'.force_encoding('UTF-8')},
70-
{"k" => %w(v ビ).map {|v| v.force_encoding('UTF-8')}},
71-
{"k" => {"l" => 'ビ'.force_encoding('UTF-8')}},
72-
], d.filtered.map {|e| e.last}
69+
{"k" => 'v'.force_encoding('UTF-8')},
70+
{"k" => %w(v ビ).map{|v| v.force_encoding('UTF-8')}},
71+
{"k" => {"l" => 'ビ'.force_encoding('UTF-8')}},
72+
], d.filtered.map { |e| e.last }
7373
end
7474

7575
def test_convert_char_encoding
@@ -79,15 +79,15 @@ def test_convert_char_encoding
7979

8080
d.run(default_tag: @tag) do
8181
d.feed("k" => 'v'.force_encoding('utf-8'))
82-
d.feed("k" => %w(v ビ).map {|v| v.force_encoding('utf-8')})
82+
d.feed("k" => %w(v ビ).map{|v| v.force_encoding('utf-8')})
8383
d.feed("k" => {"l" => 'ビ'.force_encoding('utf-8')})
8484
end
8585

8686
assert_equal [
87-
{"k" => 'v'.force_encoding('cp932')},
88-
{"k" => %w(v ビ).map {|v| v.encode!('cp932')}},
89-
{"k" => {"l" => 'ビ'.encode!('cp932')}},
90-
], d.filtered.map {|e| e.last}
87+
{"k" => 'v'.force_encoding('cp932')},
88+
{"k" => %w(v ビ).map {|v| v.encode!('cp932')}},
89+
{"k" => {"l" => 'ビ'.encode!('cp932')}},
90+
], d.filtered.map { |e| e.last }
9191
end
9292

9393
def test_remove_one_key
@@ -99,7 +99,7 @@ def test_remove_one_key
9999
d.feed("k1" => 'v', "k2" => 'v')
100100
end
101101

102-
assert_equal [{"k2" => 'v'}], d.filtered.map {|e| e.last}
102+
assert_equal [{"k2" => 'v'}], d.filtered.map { |e| e.last }
103103
end
104104

105105
def test_remove_multiple_keys
@@ -111,7 +111,7 @@ def test_remove_multiple_keys
111111
d.feed({"k1" => 'v', "k2" => 'v', "k4" => 'v'})
112112
end
113113

114-
assert_equal [{"k4" => 'v'}], d.filtered.map {|e| e.last}
114+
assert_equal [{"k4" => 'v'}], d.filtered.map { |e| e.last }
115115
end
116116

117117
def test_remove_non_whitelist_keys
@@ -192,9 +192,9 @@ def test_set_char_encoding
192192
end
193193

194194
assert_equal [
195-
{"k" => 'v'.force_encoding('UTF-8'), 'n' => 1},
196-
{"k" => {"l" => 'v'.force_encoding('UTF-8'), 'n' => 1}},
197-
], d.filtered.map {|e| e.last}
195+
{"k" => 'v'.force_encoding('UTF-8'), 'n' => 1},
196+
{"k" => {"l" => 'v'.force_encoding('UTF-8'), 'n' => 1}},
197+
], d.filtered.map { |e| e.last }
198198
end
199199

200200
def test_convert_char_encoding
@@ -208,9 +208,9 @@ def test_convert_char_encoding
208208
end
209209

210210
assert_equal [
211-
{"k" => 'v'.force_encoding('cp932'), 'n' => 1},
212-
{"k" => {"l" => 'v'.force_encoding('cp932'), 'n' => 1}},
213-
], d.filtered.map {|e| e.last}
211+
{"k" => 'v'.force_encoding('cp932'), 'n' => 1},
212+
{"k" => {"l" => 'v'.force_encoding('cp932'), 'n' => 1}},
213+
], d.filtered.map { |e| e.last }
214214
end
215215
end
216216
end

0 commit comments

Comments
 (0)