tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-26 15:14:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

GelfWriter: Ensure to join queue and execute queries on Pause/Shutdown/Reload

Browse Source
This commit is contained in:
Michael Friedrich 2019-02-20 17:18:24 +01:00
parent 24c3572b03
commit 68e7027c93
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/perfdata/gelfwriter.cpp
View File

@ -107,12 +107,26 @@ void GelfWriter::Resume()
Checkable::OnStateChange.connect(std::bind(&GelfWriter::StateChangeHandler, this, _1, _2, _3)); 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() void GelfWriter::Pause()
{ {
Log(LogInformation, "GelfWriter") m_ReconnectTimer.reset();
<< "'" << GetName() << "' paused.";
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(); m_WorkQueue.Join();
DisconnectInternal();
Log(LogInformation, "GraphiteWriter")
<< "'" << GetName() << "' paused.";
ObjectImpl<GelfWriter>::Pause(); ObjectImpl<GelfWriter>::Pause();
} }
@ -145,6 +159,11 @@ void GelfWriter::Reconnect()
return; return;
} }
ReconnectInternal();
}
void GelfWriter::ReconnectInternal()
{
double startTime = Utility::GetTime(); double startTime = Utility::GetTime();
CONTEXT("Reconnecting to Graylog Gelf '" + GetName() + "'"); CONTEXT("Reconnecting to Graylog Gelf '" + GetName() + "'");
@ -184,6 +203,11 @@ void GelfWriter::Disconnect()
{ {
AssertOnWorkQueue(); AssertOnWorkQueue();
DisconnectInternal();
}
void GelfWriter::DisconnectInternal()
{
if (!GetConnected()) if (!GetConnected())
return; return;

2
lib/perfdata/gelfwriter.hpp
View File

@ -72,7 +72,9 @@ private:
void ReconnectTimerHandler(); void ReconnectTimerHandler();
void Disconnect(); void Disconnect();
void DisconnectInternal();
void Reconnect(); void Reconnect();
void ReconnectInternal();
void AssertOnWorkQueue(); void AssertOnWorkQueue();