diff --git a/logstash-core/lib/logstash/agent.rb b/logstash-core/lib/logstash/agent.rb index e915d8587..e6eecdfd7 100644 --- a/logstash-core/lib/logstash/agent.rb +++ b/logstash-core/lib/logstash/agent.rb @@ -190,13 +190,6 @@ class LogStash::Agent converge_result end - def force_shutdown! - stop_collecting_metrics - stop_webserver - transition_to_stopped - force_shutdown_pipelines! - end - def id return @id if @id @@ -427,13 +420,6 @@ class LogStash::Agent @collect_metric end - def force_shutdown_pipelines! - @pipelines.each do |_, pipeline| - # TODO(ph): should it be his own action? - pipeline.force_shutdown! - end - end - def shutdown_pipelines logger.debug("Shutting down all pipelines", :pipelines_count => pipelines_count) diff --git a/logstash-core/lib/logstash/runner.rb b/logstash-core/lib/logstash/runner.rb index 835723cdd..220fc808b 100644 --- a/logstash-core/lib/logstash/runner.rb +++ b/logstash-core/lib/logstash/runner.rb @@ -468,8 +468,7 @@ class LogStash::Runner < Clamp::StrictCommand Stud::trap("INT") do if @interrupted_once logger.fatal(I18n.t("logstash.agent.forced_sigint")) - @agent.force_shutdown! - exit + exit(1) else logger.warn(I18n.t("logstash.agent.sigint")) Thread.new(logger) {|lg| sleep 5; lg.warn(I18n.t("logstash.agent.slow_shutdown")) }