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

Bug Fix: Log messages from Java code base

Browse source 
This change re-configures default instead of creating a new context.

Fixes #7526

Fixes #7528
This commit is contained in:
Jake Landis 2017-07-06 10:14:28 -05:00
parent 89236f02b4
commit 3a6902c2f3
6 changed files with 121 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qa/integration/specs/monitoring_api_spec.rb
View file

@ -128,8 +128,8 @@ describe "Test Monitoring API" do
result = logstash_service.monitoring_api.logging_get
result["loggers"].each do | k, v |
#since we explicitly set the logstash.agent logger above, the parent logger will not take precedence
if k.eql? "logstash.agent"
#since we explicitly set the logstash.agent logger above, the logger.logstash parent logger will not take precedence
if k.eql?("logstash.agent") || k.start_with?("org.logstash")
expect(v).to eq("INFO")
else
expect(v).to eq("ERROR")
@ -143,7 +143,7 @@ describe "Test Monitoring API" do
def logging_get_assert(logstash_service, logstash_level, slowlog_level)
result = logstash_service.monitoring_api.logging_get
result["loggers"].each do | k, v |
if k.start_with? "logstash"
if k.start_with? "logstash", "org.logstash" #logstash is the ruby namespace, and org.logstash for java
expect(v).to eq(logstash_level)
elsif k.start_with? "slowlog"
expect(v).to eq(slowlog_level)