Don't log error messages when TLS connections are closed
authorGunnar Beutner <gunnar.beutner@netways.de>
Thu, 16 Oct 2014 11:11:14 +0000 (13:11 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Thu, 16 Oct 2014 11:11:14 +0000 (13:11 +0200)
refs #7244

lib/base/tlsstream.cpp

index 347dd67c7673cf3c03126e189c56499fc65523e3..a050f7fa5ab82c197a320b857e6d19e90571153a 100644 (file)
@@ -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")