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: do not leak ThreadContext into the system

Browse source 
this is fairly recent - since 7.4 (added in GH-11075)

there's a risk plugins would assume ThreadContext to
exist or collide the 'global' constant - usually best
to import where the Java class actually gets used ...

Fixes #11356
This commit is contained in:
Karol Bucek 2019-11-27 21:45:51 +01:00
parent 1431df892f
commit 16c085588f
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
logstash-core/lib/logstash/java_pipeline.rb
View file

@ -8,10 +8,11 @@ require "logstash/instrument/collector"
require "logstash/compiler"
require "logstash/config/lir_serializer"
java_import org.apache.logging.log4j.ThreadContext
module LogStash; class JavaPipeline < JavaBasePipeline
include LogStash::Util::Loggable
java_import org.apache.logging.log4j.ThreadContext
attr_reader \
:worker_threads,
:events_consumed,

4
logstash-core/lib/logstash/pipeline.rb
View file

@ -12,11 +12,11 @@ require "logstash/instrument/collector"
require "logstash/filter_delegator"
require "logstash/compiler"
java_import org.apache.logging.log4j.ThreadContext
module LogStash; class BasePipeline < AbstractPipeline
include LogStash::Util::Loggable
java_import org.apache.logging.log4j.ThreadContext
attr_reader :inputs, :filters, :outputs
def initialize(pipeline_config, namespaced_metric = nil, agent = nil)