Skip to content

Commit 6574dea

Browse files
committed
Extract complicated clause as a method
Signed-off-by: Hiroshi Hatake <[email protected]>
1 parent 4ce160b commit 6574dea

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

lib/fluent/plugin/filter_concat.rb

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,18 @@ def initialize
5858
end
5959
end
6060

61+
def required_params
62+
params = [@n_lines.nil?, @multiline_start_regexp.nil?, @multiline_end_regexp.nil?, @partial_key.nil?, !@use_partial_metadata, !@use_partial_cri_logtag]
63+
names = ["n_lines", "multiline_start_regexp", "multiline_end_regexp", "partial_key", "use_partial_metadata", "use_partial_cri_logtag"]
64+
return params, names
65+
end
66+
6167
def configure(conf)
6268
super
6369

64-
if @n_lines.nil? && @multiline_start_regexp.nil? && @multiline_end_regexp.nil? && @partial_key.nil? && !@use_partial_metadata && !@use_partial_cri_logtag
65-
raise Fluent::ConfigError, "Either n_lines, multiline_start_regexp, multiline_end_regexp, partial_key, use_partial_metadata or use_partial_cri_logtag is required"
70+
params, names = required_params
71+
if params.reject{|e| e == true}.empty?
72+
raise Fluent::ConfigError, "Either #{[names[0..-2].join(", "), names[-1]].join(" or ")} is required"
6673
end
6774
if @n_lines && (@multiline_start_regexp || @multiline_end_regexp)
6875
raise Fluent::ConfigError, "n_lines and multiline_start_regexp/multiline_end_regexp are exclusive"

0 commit comments

Comments
 (0)