From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Thu, 16 Oct 2014 11:11:14 +0000 (+0200)
Subject: Don't log error messages when TLS connections are closed
X-Git-Tag: v2.2.0~366
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f67a11c183077969405c7c5507e4e38df759e095;p=icinga2

Don't log error messages when TLS connections are closed

refs #7244
---

diff --git a/lib/base/tlsstream.cpp b/lib/base/tlsstream.cpp
index 347dd67c7..a050f7fa5 100644
--- a/lib/base/tlsstream.cpp
+++ b/lib/base/tlsstream.cpp
@@ -200,8 +200,10 @@ size_t TlsStream::Read(void *buffer, size_t count)
 					Close();
 					return count - left;
 				default:
-					msgbuf << "SSL_read() failed with code " << ERR_peek_error() << ", \"" << ERR_error_string(ERR_peek_error(), errbuf) << "\"";
-					Log(LogCritical, "TlsStream", msgbuf.str());
+					if (ERR_peek_error() != 0) {
+						msgbuf << "SSL_read() failed with code " << ERR_peek_error() << ", \"" << ERR_error_string(ERR_peek_error(), errbuf) << "\"";
+						Log(LogCritical, "TlsStream", msgbuf.str());
+					}
 
 					BOOST_THROW_EXCEPTION(openssl_error()
 					    << boost::errinfo_api_function("SSL_read")
@@ -260,8 +262,10 @@ void TlsStream::Write(const void *buffer, size_t count)
 					Close();
 					return;
 				default:
-					msgbuf << "SSL_write() failed with code " << ERR_peek_error() << ", \"" << ERR_error_string(ERR_peek_error(), errbuf) << "\"";
-					Log(LogCritical, "TlsStream", msgbuf.str());
+					if (ERR_peek_error() != 0) {
+						msgbuf << "SSL_write() failed with code " << ERR_peek_error() << ", \"" << ERR_error_string(ERR_peek_error(), errbuf) << "\"";
+						Log(LogCritical, "TlsStream", msgbuf.str());
+					}
 
 					BOOST_THROW_EXCEPTION(openssl_error()
 					    << boost::errinfo_api_function("SSL_write")