tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't write new-lines to the Graphite socket to test if it's still connected 

fixes #6549
This commit is contained in:
Gunnar Beutner 2014-08-06 09:59:38 +02:00
parent d2ddde3fec
commit 089fdb1b20
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/perfdata/graphitewriter.cpp
View File

@ -74,15 +74,8 @@ void GraphiteWriter::Start(void)
void GraphiteWriter::ReconnectTimerHandler(void)
{
try {
if (m_Stream) {
m_Stream->Write("\n", 1);
Log(LogNotice, "GraphiteWriter", "Already connected on socket on host '" + GetHost() + "' port '" + GetPort() + "'.");
return;
}
} catch (const std::exception&) {
Log(LogWarning, "GraphiteWriter", "Socket on host '" + GetHost() + "' port '" + GetPort() + "' gone. Attempting to reconnect.");
}
if (m_Stream)
return;
TcpSocket::Ptr socket = make_shared<TcpSocket>();
@ -185,7 +178,7 @@ void GraphiteWriter::SendMetric(const String& prefix, const String& name, double
try {
m_Stream->Write(metric.CStr(), metric.GetLength());
} catch (const std::exception& ex) {
Log(LogCritical, "GraphiteWriter", "Cannot write to tcp socket on host '" + GetHost() + "' port '" + GetPort() + "'.");
Log(LogCritical, "GraphiteWriter", "Cannot write to TCP socket on host '" + GetHost() + "' port '" + GetPort() + "'.");
m_Stream.reset();
}