*#Stop(): wait for own Checkable#ProcessCheckResult()s to finish

Author: Al2Klimov

lib/checker/checkercomponent.cpp

@@ -60,6 +60,7 @@ void CheckerComponent::OnConfigLoaded()
 void CheckerComponent::Start(bool runtimeCreated)
 {
 	ObjectImpl<CheckerComponent>::Start(runtimeCreated);
+	CheckResultProducerComponent::Start();
 
 	Log(LogInformation, "CheckerComponent")
 		<< "'" << GetName() << "' started.";
@@ -81,6 +82,7 @@ void CheckerComponent::Stop(bool runtimeRemoved)
 		m_CV.notify_all();
 	}
 
+	CheckResultProducerComponent::Stop();
 	m_ResultTimer->Stop(true);
 	m_Thread.join();
 

lib/checker/checkercomponent.hpp

@@ -8,6 +8,7 @@
 #include "base/configobject.hpp"
 #include "base/timer.hpp"
 #include "base/utility.hpp"
+#include "remote/crproducer.hpp"
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/ordered_index.hpp>
 #include <boost/multi_index/key_extractors.hpp>
@@ -46,7 +47,7 @@ struct CheckableNextCheckExtractor
 /**
  * @ingroup checker
  */
-class CheckerComponent final : public ObjectImpl<CheckerComponent>
+class CheckerComponent final : public ObjectImpl<CheckerComponent>, public CheckResultProducerComponent
 {
 public:
 	DECLARE_OBJECT(CheckerComponent);

lib/compat/externalcommandlistener.cpp

@@ -32,6 +32,7 @@ void ExternalCommandListener::StatsFunc(const Dictionary::Ptr& status, const Arr
 void ExternalCommandListener::Start(bool runtimeCreated)
 {
 	ObjectImpl<ExternalCommandListener>::Start(runtimeCreated);
+	CheckResultProducerComponent::Start();
 
 	Log(LogInformation, "ExternalCommandListener")
 		<< "'" << GetName() << "' started.";
@@ -50,6 +51,8 @@ void ExternalCommandListener::Start(bool runtimeCreated)
  */
 void ExternalCommandListener::Stop(bool runtimeRemoved)
 {
+	CheckResultProducerComponent::Stop();
+
 	Log(LogInformation, "ExternalCommandListener")
 		<< "'" << GetName() << "' stopped.";
 

lib/compat/externalcommandlistener.hpp

@@ -7,6 +7,7 @@
 #include "base/objectlock.hpp"
 #include "base/timer.hpp"
 #include "base/utility.hpp"
+#include "remote/crproducer.hpp"
 #include <thread>
 #include <iostream>
 
@@ -16,7 +17,7 @@ namespace icinga
 /**
  * @ingroup compat
  */
-class ExternalCommandListener final : public ObjectImpl<ExternalCommandListener>
+class ExternalCommandListener final : public ObjectImpl<ExternalCommandListener>, public CheckResultProducerComponent
 {
 public:
 	DECLARE_OBJECT(ExternalCommandListener);

lib/livestatus/livestatuslistener.cpp

@@ -47,6 +47,7 @@ void LivestatusListener::StatsFunc(const Dictionary::Ptr& status, const Array::P
 void LivestatusListener::Start(bool runtimeCreated)
 {
 	ObjectImpl<LivestatusListener>::Start(runtimeCreated);
+	CheckResultProducerComponent::Start();
 
 	Log(LogInformation, "LivestatusListener")
 		<< "'" << GetName() << "' started.";
@@ -112,6 +113,7 @@ void LivestatusListener::Stop(bool runtimeRemoved)
 		<< "'" << GetName() << "' stopped.";
 
 	m_Listener->Close();
+	CheckResultProducerComponent::Stop();
 
 	if (m_Thread.joinable())
 		m_Thread.join();

lib/livestatus/livestatuslistener.hpp

@@ -7,6 +7,7 @@
 #include "livestatus/livestatuslistener-ti.hpp"
 #include "livestatus/livestatusquery.hpp"
 #include "base/socket.hpp"
+#include "remote/crproducer.hpp"
 #include <thread>
 
 using namespace icinga;
@@ -17,7 +18,7 @@ namespace icinga
 /**
  * @ingroup livestatus
  */
-class LivestatusListener final : public ObjectImpl<LivestatusListener>
+class LivestatusListener final : public ObjectImpl<LivestatusListener>, public CheckResultProducerComponent
 {
 public:
 	DECLARE_OBJECT(LivestatusListener);

lib/remote/apilistener.cpp

@@ -239,6 +239,8 @@ void ApiListener::OnAllConfigLoaded()
  */
 void ApiListener::Start(bool runtimeCreated)
 {
+	CheckResultProducerComponent::Start();
+
 	Log(LogInformation, "ApiListener")
 		<< "'" << GetName() << "' started.";
 
@@ -368,6 +370,7 @@ void ApiListener::Stop(bool runtimeDeleted)
 	m_Timer->Stop(true);
 	m_RenewOwnCertTimer->Stop(true);
 
+	CheckResultProducerComponent::Stop();
 	ObjectImpl<ApiListener>::Stop(runtimeDeleted);
 
 	Log(LogInformation, "ApiListener")

lib/remote/apilistener.hpp

@@ -4,6 +4,7 @@
 #define APILISTENER_H
 
 #include "remote/apilistener-ti.hpp"
+#include "remote/crproducer.hpp"
 #include "remote/jsonrpcconnection.hpp"
 #include "remote/httpserverconnection.hpp"
 #include "remote/endpoint.hpp"
@@ -74,7 +75,7 @@ enum class ApiCapabilities : uint_fast64_t
 /**
 * @ingroup remote
 */
-class ApiListener final : public ObjectImpl<ApiListener>
+class ApiListener final : public ObjectImpl<ApiListener>, public CheckResultProducerComponent
 {
 public:
 	DECLARE_OBJECT(ApiListener);