From c0e2fb462dcbe33f5d462876b098083d0ea5f815 Mon Sep 17 00:00:00 2001
From: Colin Surprenant <colin.surprenant@gmail.com>
Date: Wed, 9 Jan 2019 18:12:04 -0500
Subject: [PATCH] properly set thread name in thread context
---
logstash-core/lib/logstash/java_pipeline.rb | 2 +-
logstash-core/lib/logstash/pipeline.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/logstash-core/lib/logstash/java_pipeline.rb b/logstash-core/lib/logstash/java_pipeline.rb
index 38a3f54e8a3..8f98ef8c08e 100644
--- a/logstash-core/lib/logstash/java_pipeline.rb
+++ b/logstash-core/lib/logstash/java_pipeline.rb
@@ -216,11 +216,11 @@ def start_workers
pipeline_workers.times do |t|
thread = Thread.new do
+ Util.set_thread_name("[#{pipeline_id}]>worker#{t}")
org.logstash.execution.WorkerLoop.new(
lir_execution, filter_queue_client, @events_filtered, @events_consumed,
@flushRequested, @flushing, @shutdownRequested, @drain_queue).run
end
- Util.set_thread_name("[#{pipeline_id}]>worker#{t}")
@worker_threads << thread
end
diff --git a/logstash-core/lib/logstash/pipeline.rb b/logstash-core/lib/logstash/pipeline.rb
index ce1746f2dec..b545f41dca9 100644
--- a/logstash-core/lib/logstash/pipeline.rb
+++ b/logstash-core/lib/logstash/pipeline.rb
@@ -283,9 +283,9 @@ def start_workers
pipeline_workers.times do |t|
thread = Thread.new(batch_size, batch_delay, self) do |_b_size, _b_delay, _pipeline|
+ Util.set_thread_name("[#{pipeline_id}]>worker#{t}")
_pipeline.worker_loop(_b_size, _b_delay)
end
- Util.set_thread_name("[#{pipeline_id}]>worker#{t}")
@worker_threads << thread
end