mirror of
https://github.com/elastic/logstash.git
synced 2025-04-23 22:27:21 -04:00
parent
0f27338495
commit
3de59fec01
2 changed files with 2 additions and 12 deletions
|
@ -5,16 +5,7 @@ module LogStash::Util::JavaVersion
|
|||
def self.logger
|
||||
@logger ||= Cabin::Channel.get(LogStash)
|
||||
end
|
||||
|
||||
# Print a warning if we're on a bad version of java
|
||||
def self.warn_on_bad_java_version
|
||||
if self.bad_java_version?(self.version)
|
||||
msg = "!!! Please upgrade your java version, the current version '#{self.version}' is not supported. We recommend a minimum version of Java 8"
|
||||
STDERR.puts(msg)
|
||||
logger.warn(msg)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
# Return the current java version string. Returns nil if this is a non-java platform (e.g. MRI).
|
||||
def self.version
|
||||
return nil unless LogStash::Environment.jruby?
|
||||
|
|
|
@ -45,8 +45,7 @@ describe LogStash::Runner do
|
|||
let(:agent) { double("agent") }
|
||||
|
||||
before(:each) do
|
||||
allow(LogStash::Agent).to receive(:new).and_return(agent)
|
||||
allow(LogStash::Util::JavaVersion).to receive(:warn_on_bad_java_version)
|
||||
allow(LogStash::Agent).to receive(:new).and_return(agent)
|
||||
end
|
||||
|
||||
it "should show help" do
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue