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

agent webserver: synchronise control

Browse source 
if we send `Agent#stop_webserver` while `Agent#start_webserver` is
executing, we risk the `@webserver_thread` being nil and getting a
`NoMethodError`.

Fixes #10393
This commit is contained in:
Ry Biesemeyer 2019-02-05 22:35:19 +00:00 • committed by João Duarte
parent 6990d08be5
commit 937200d70d
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
logstash-core/lib/logstash/agent.rb
View file

@ -20,7 +20,7 @@ class LogStash::Agent
include LogStash::Util::Loggable
STARTED_AT = Time.now.freeze
attr_reader :metric, :name, :settings, :webserver, :dispatcher, :ephemeral_id, :pipeline_bus
attr_reader :metric, :name, :settings, :dispatcher, :ephemeral_id, :pipeline_bus
attr_accessor :logger
# initialize method for LogStash::Agent
@ -37,6 +37,7 @@ class LogStash::Agent
# Mutex to synchonize in the exclusive method
# Initial usage for the Ruby pipeline initialization which is not thread safe
@exclusive_lock = Mutex.new
@webserver_control_lock = Mutex.new
# Special bus object for inter-pipelines communications. Used by the `pipeline` input/output
@pipeline_bus = org.logstash.plugins.pipeline.PipelineBus.new
@ -364,20 +365,24 @@ class LogStash::Agent
end
def start_webserver
options = {:http_host => @http_host, :http_ports => @http_port, :http_environment => @http_environment }
@webserver = LogStash::WebServer.new(@logger, self, options)
@webserver_thread = Thread.new(@webserver) do |webserver|
LogStash::Util.set_thread_name("Api Webserver")
webserver.run
@webserver_control_lock.synchronize do
options = {:http_host => @http_host, :http_ports => @http_port, :http_environment => @http_environment }
@webserver = LogStash::WebServer.new(@logger, self, options)
@webserver_thread = Thread.new(@webserver) do |webserver|
LogStash::Util.set_thread_name("Api Webserver")
webserver.run
end
end
end
def stop_webserver
if @webserver
@webserver.stop
if @webserver_thread.join(5).nil?
@webserver_thread.kill
@webserver_thread.join
@webserver_control_lock.synchronize do
if @webserver
@webserver.stop
if @webserver_thread.join(5).nil?
@webserver_thread.kill
@webserver_thread.join
end
end
end
end