Skip to content

Commit 6f55066

Browse files
authored
Fix Date class clash when used in pipelines with Date filter and GeoIP and pin open-ssl to 0.10.5 (#12811)
This commit contains two fixes * Fix Date class clash when used in pipelines with Date filter and GeoIP * Pinned jruby-openssl version 0.10.5 to avoid SSL errors
1 parent c698aa2 commit 6f55066

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

logstash-core/logstash-core.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Gem::Specification.new do |gem|
5757
gem.add_runtime_dependency "mustermann", '~> 1.0.3'
5858
gem.add_runtime_dependency "sinatra", '~> 2'
5959
gem.add_runtime_dependency 'puma', '~> 4'
60-
gem.add_runtime_dependency "jruby-openssl", "~> 0.10" # >= 0.9.13 Required to support TLSv1.2
60+
gem.add_runtime_dependency "jruby-openssl", "= 0.10.5" # >= 0.9.13 Required to support TLSv1.2
6161

6262
gem.add_runtime_dependency "treetop", "~> 1" #(MIT license)
6363

x-pack/lib/filters/geoip/database_manager.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def patch_database_path(database_path)
106106
end
107107

108108
def check_age
109-
days_without_update = (Date.today - Time.at(@metadata.updated_at).to_date).to_i
109+
days_without_update = (::Date.today - ::Time.at(@metadata.updated_at).to_date).to_i
110110

111111
case
112112
when days_without_update >= 30

0 commit comments

Comments
 (0)