diff --git a/logstash-core/lib/logstash/output_delegator.rb b/logstash-core/lib/logstash/output_delegator.rb index d0f15ef5f..e4c5df7c2 100644 --- a/logstash-core/lib/logstash/output_delegator.rb +++ b/logstash-core/lib/logstash/output_delegator.rb @@ -74,10 +74,12 @@ module LogStash; class OutputDelegator # The user has configured extra workers, but this plugin doesn't support it :( if worker_limits_overriden? message = @klass.workers_not_supported_message + warning_meta = {:plugin => @klass.config_name, :worker_count => @config["workers"]} if message - @logger.warn(I18n.t("logstash.pipeline.output-worker-unsupported-with-message", :plugin => @klass.config_name, :worker_count => @config["workers"], :message => message)) + warning_meta[:message] = message + @logger.warn(I18n.t("logstash.pipeline.output-worker-unsupported-with-message", warning_meta)) else - @logger.warn(I18n.t("logstash.pipeline.output-worker-unsupported", :plugin => @klass.config_name, :worker_count => @config["workers"], :message => message)) + @logger.warn(I18n.t("logstash.pipeline.output-worker-unsupported", warning_meta)) end end end diff --git a/logstash-core/locales/en.yml b/logstash-core/locales/en.yml index a951265e1..f2d1666ee 100644 --- a/logstash-core/locales/en.yml +++ b/logstash-core/locales/en.yml @@ -39,7 +39,7 @@ en: output-worker-unsupported-with-message: >- %{plugin} output plugin: setting 'workers => %{worker_count}' is not supported by this plugin. I will continue working as if you had not set - this setting. + this setting. Reason: %{message} plugin: deprecated_milestone: >- %{plugin} plugin is using the 'milestone' method to declare the version