github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 06:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Updates callsites synthax for i18n.t method to avoid deprecated and prohibited format (#15500) (#15501)

Browse source 
Updates invocations of i18n.t method which are leftovers and missed in the original Ruby 3.1 update PR #14861

Without this, some error reporting logs are hidden by the mismatch of arguments error in translate the error message.

(cherry picked from commit 90964fb559)

Co-authored-by: Andrea Selva <selva.andre@gmail.com>
This commit is contained in:
github-actions[bot] 2023-10-25 12:28:07 +02:00 • committed by GitHub
parent c4ae135b0c
commit 856b87ff7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
logstash-core/lib/logstash/java_pipeline.rb
View file

@ -426,7 +426,7 @@ module LogStash; class JavaPipeline < AbstractPipeline
# otherwise, report error and restart
@logger.error(I18n.t(
"logstash.pipeline.worker-error-debug",
default_logging_keys(
**default_logging_keys(
:plugin => plugin.inspect,
:error => e.message,
:exception => e.class,

2
logstash-core/lib/logstash/runner.rb
View file

@ -336,7 +336,7 @@ class LogStash::Runner < Clamp::StrictCommand
field_reference_escape_style_setting = settings.get_setting('config.field_reference.escape_style')
if field_reference_escape_style_setting.set?
logger.warn(I18n.t("logstash.settings.technical_preview.set", canonical_name: field_reference_escape_style_setting.name))
logger.warn(I18n.t("logstash.settings.technical_preview.set", :canonical_name => field_reference_escape_style_setting.name))
end
field_reference_escape_style = field_reference_escape_style_setting.value
logger.debug("Setting global FieldReference escape style: #{field_reference_escape_style}")

12
logstash-core/lib/logstash/settings.rb
View file

@ -840,15 +840,15 @@ module LogStash
def set(value)
deprecation_logger.deprecated(I18n.t("logstash.settings.deprecation.set",
deprecated_alias: name,
canonical_name: canonical_proxy.name))
:deprecated_alias => name,
:canonical_name => canonical_proxy.name))
super
end
def value
logger.warn(I18n.t("logstash.settings.deprecation.queried",
deprecated_alias: name,
canonical_name: canonical_proxy.name))
:deprecated_alias => name,
:canonical_name => canonical_proxy.name))
@canonical_proxy.value
end
@ -914,8 +914,8 @@ module LogStash
def validate_value
if deprecated_alias.set? && canonical_setting.set?
fail(ArgumentError, I18n.t("logstash.settings.deprecation.ambiguous",
canonical_name: canonical_setting.name,
deprecated_alias: deprecated_alias.name))
:canonical_name => canonical_setting.name,
:deprecated_alias => deprecated_alias.name))
end
super