From 68e7027c937a0b91e5d75f95971c9b0423f72603 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Wed, 20 Feb 2019 17:18:24 +0100
Subject: [PATCH] GelfWriter: Ensure to join queue and execute queries on
 Pause/Shutdown/Reload

---
 lib/perfdata/gelfwriter.cpp | 28 ++++++++++++++++++++++++++--
 lib/perfdata/gelfwriter.hpp |  2 ++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/lib/perfdata/gelfwriter.cpp b/lib/perfdata/gelfwriter.cpp
index c4c0912d2..ea49231a3 100644
--- a/lib/perfdata/gelfwriter.cpp
+++ b/lib/perfdata/gelfwriter.cpp
@@ -107,12 +107,26 @@ void GelfWriter::Resume()
 	Checkable::OnStateChange.connect(std::bind(&GelfWriter::StateChangeHandler, this, _1, _2, _3));
 }
 
+/* Pause is equivalent to Stop, but with HA capabilities to resume at runtime. */
 void GelfWriter::Pause()
 {
-	Log(LogInformation, "GelfWriter")
-		<< "'" << GetName() << "' paused.";
+	m_ReconnectTimer.reset();
+
+	try {
+		ReconnectInternal();
+	} catch (const std::exception&) {
+		Log(LogInformation, "GelfWriter")
+			<< "'" << GetName() << "' paused. Unable to connect, not flushing buffers. Data may be lost on reload.";
+
+		ObjectImpl<GelfWriter>::Pause();
+		return;
+	}
 
 	m_WorkQueue.Join();
+	DisconnectInternal();
+
+	Log(LogInformation, "GraphiteWriter")
+		<< "'" << GetName() << "' paused.";
 
 	ObjectImpl<GelfWriter>::Pause();
 }
@@ -145,6 +159,11 @@ void GelfWriter::Reconnect()
 		return;
 	}
 
+	ReconnectInternal();
+}
+
+void GelfWriter::ReconnectInternal()
+{
 	double startTime = Utility::GetTime();
 
 	CONTEXT("Reconnecting to Graylog Gelf '" + GetName() + "'");
@@ -184,6 +203,11 @@ void GelfWriter::Disconnect()
 {
 	AssertOnWorkQueue();
 
+	DisconnectInternal();
+}
+
+void GelfWriter::DisconnectInternal()
+{
 	if (!GetConnected())
 		return;
 
diff --git a/lib/perfdata/gelfwriter.hpp b/lib/perfdata/gelfwriter.hpp
index 32e35da57..edff50997 100644
--- a/lib/perfdata/gelfwriter.hpp
+++ b/lib/perfdata/gelfwriter.hpp
@@ -72,7 +72,9 @@ private:
 	void ReconnectTimerHandler();
 
 	void Disconnect();
+	void DisconnectInternal();
 	void Reconnect();
+	void ReconnectInternal();
 
 	void AssertOnWorkQueue();