Skip to content

Fix referencing Gem classes from global lexical #1044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 14, 2021
Merged

Fix referencing Gem classes from global lexical #1044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 11.2.1
- Fix referencing Gem classes from global lexical scope [#1044](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/1044)

## 11.2.0
- Added preflight checks on Elasticsearch [#1026](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/1026)

Expand Down
8 changes: 4 additions & 4 deletions lib/logstash/outputs/elasticsearch/http_client/pool.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ def message
ROOT_URI_PATH = '/'.freeze
LICENSE_PATH = '/_license'.freeze

VERSION_6_TO_7 = Gem::Requirement.new([">= 6.0.0", "< 7.0.0"])
VERSION_7_TO_7_14 = Gem::Requirement.new([">= 7.0.0", "< 7.14.0"])
VERSION_6_TO_7 = ::Gem::Requirement.new([">= 6.0.0", "< 7.0.0"])
VERSION_7_TO_7_14 = ::Gem::Requirement.new([">= 7.0.0", "< 7.14.0"])

DEFAULT_OPTIONS = {
:healthcheck_path => ROOT_URI_PATH,
Expand Down Expand Up @@ -275,8 +275,8 @@ def elasticsearch?(url)
version_info = LogStash::Json.load(response.body)
return false if version_info['version'].nil?

version = Gem::Version.new(version_info["version"]['number'])
return false if version < Gem::Version.new('6.0.0')
version = ::Gem::Version.new(version_info["version"]['number'])
return false if version < ::Gem::Version.new('6.0.0')

if VERSION_6_TO_7.satisfied_by?(version)
return valid_tagline?(version_info)
Expand Down
2 changes: 1 addition & 1 deletion logstash-output-elasticsearch.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = 'logstash-output-elasticsearch'
s.version = '11.2.0'
s.version = '11.2.1'

s.licenses = ['apache-2.0']
s.summary = "Stores logs in Elasticsearch"
Expand Down