From 813e6e2dfd715d3dcf5083110868d62b3c526e4c Mon Sep 17 00:00:00 2001 From: Masahiro Nakagawa Date: Thu, 2 Oct 2014 17:36:43 +0900 Subject: [PATCH 1/2] '--suppress-repeated-stacktrace' is true by default We keep this option for backward compatibility. Maybe, there is no user who wants to disable this option. We will remove related code in the future. --- lib/fluent/supervisor.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fluent/supervisor.rb b/lib/fluent/supervisor.rb index cc28532982..680e29b757 100644 --- a/lib/fluent/supervisor.rb +++ b/lib/fluent/supervisor.rb @@ -85,7 +85,7 @@ def self.default_options :chuser => nil, :chgroup => nil, :suppress_interval => 0, - :suppress_repeated_stacktrace => false, + :suppress_repeated_stacktrace => true, :without_source => false, :use_v1_config => true, } From 4b8bf399d7371d978204f1e4e3b4a04732153729 Mon Sep 17 00:00:00 2001 From: Masahiro Nakagawa Date: Thu, 2 Oct 2014 18:52:13 +0900 Subject: [PATCH 2/2] Support '--suppress-repeated-stacktrace false' to disable suppress mode --- lib/fluent/command/fluentd.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/fluent/command/fluentd.rb b/lib/fluent/command/fluentd.rb index dcd314947f..b13568dcd6 100644 --- a/lib/fluent/command/fluentd.rb +++ b/lib/fluent/command/fluentd.rb @@ -70,7 +70,8 @@ opts[:suppress_interval] = s.to_i } -op.on('--suppress-repeated-stacktrace', "suppress repeated stacktrace", TrueClass) {|b| +op.on('--suppress-repeated-stacktrace [VALUE]', "suppress repeated stacktrace", TrueClass) {|b| + b = true if b.nil? opts[:suppress_repeated_stacktrace] = b }