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

Fix Date class clash when used in pipelines with Date filter and GeoIP and pin open-ssl to 0.10.5 (#12811) (#12812)

Browse source 
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

(cherry picked from commit 6f55066b17)
This commit is contained in:
Andrea Selva 2021-04-13 15:20:12 +02:00 • committed by GitHub
parent b852daf202
commit 5a9048c4df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
logstash-core/logstash-core.gemspec
View file

@ -57,7 +57,7 @@ Gem::Specification.new do |gem|
gem.add_runtime_dependency "mustermann", '~> 1.0.3'
gem.add_runtime_dependency "sinatra", '~> 2'
gem.add_runtime_dependency 'puma', '~> 4'
gem.add_runtime_dependency "jruby-openssl", "~> 0.10" # >= 0.9.13 Required to support TLSv1.2
gem.add_runtime_dependency "jruby-openssl", "= 0.10.5" # >= 0.9.13 Required to support TLSv1.2
gem.add_runtime_dependency "chronic_duration", "~> 0.10"
gem.add_runtime_dependency "treetop", "~> 1" #(MIT license)

2
x-pack/lib/filters/geoip/database_manager.rb
View file

@ -106,7 +106,7 @@ module LogStash module Filters module Geoip class DatabaseManager
end
def check_age
days_without_update = (Date.today - Time.at(@metadata.updated_at).to_date).to_i
days_without_update = (::Date.today - ::Time.at(@metadata.updated_at).to_date).to_i
case
when days_without_update >= 30