From 107a152a8f92349e4b2698ea0481ea9eeec2af44 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Wed, 20 Aug 2014 14:07:23 +0200 Subject: [PATCH] Improve TLS and cluster error messages refs #6066 --- lib/base/tlsstream.cpp | 16 ++++++++-------- lib/remote/apilistener-sync.cpp | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/base/tlsstream.cpp b/lib/base/tlsstream.cpp index 68d205f7c..04b810449 100644 --- a/lib/base/tlsstream.cpp +++ b/lib/base/tlsstream.cpp @@ -44,12 +44,12 @@ TlsStream::TlsStream(const Socket::Ptr& socket, ConnectionRole role, const share m_SSL = shared_ptr(SSL_new(sslContext.get()), SSL_free); if (!m_SSL) { - msgbuf << "SSL_new() failed with code " << ERR_get_error() << ", \"" << ERR_error_string(ERR_get_error(), errbuf) << "\""; + msgbuf << "SSL_new() 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_new") - << errinfo_openssl_error(ERR_get_error())); + << errinfo_openssl_error(ERR_peek_error())); } if (!m_SSLIndexInitialized) { @@ -126,12 +126,12 @@ void TlsStream::Handshake(void) Close(); return; default: - msgbuf << "SSL_do_handshake() failed with code " << ERR_get_error() << ", \"" << ERR_error_string(ERR_get_error(), errbuf) << "\""; + msgbuf << "SSL_do_handshake() 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_do_handshake") - << errinfo_openssl_error(ERR_get_error())); + << errinfo_openssl_error(ERR_peek_error())); } } } @@ -172,12 +172,12 @@ size_t TlsStream::Read(void *buffer, size_t count) Close(); return count - left; default: - msgbuf << "SSL_read() failed with code " << ERR_get_error() << ", \"" << ERR_error_string(ERR_get_error(), errbuf) << "\""; + 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") - << errinfo_openssl_error(ERR_get_error())); + << errinfo_openssl_error(ERR_peek_error())); } } @@ -220,12 +220,12 @@ void TlsStream::Write(const void *buffer, size_t count) Close(); return; default: - msgbuf << "SSL_write() failed with code " << ERR_get_error() << ", \"" << ERR_error_string(ERR_get_error(), errbuf) << "\""; + 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") - << errinfo_openssl_error(ERR_get_error())); + << errinfo_openssl_error(ERR_peek_error())); } } diff --git a/lib/remote/apilistener-sync.cpp b/lib/remote/apilistener-sync.cpp index 3210ab4a7..62254c4b9 100644 --- a/lib/remote/apilistener-sync.cpp +++ b/lib/remote/apilistener-sync.cpp @@ -105,11 +105,11 @@ bool ApiListener::UpdateConfigDir(const Dictionary::Ptr& oldConfig, const Dictio void ApiListener::SyncZoneDir(const Zone::Ptr& zone) const { - Log(LogInformation, "ApiListener", "Syncing zone: " + zone->GetName()); - String newDir = Application::GetZonesDir() + "/" + zone->GetName(); String oldDir = Application::GetLocalStateDir() + "/lib/icinga2/api/zones/" + zone->GetName(); + Log(LogInformation, "ApiListener", "Copying zone configuration files from '" + newDir + "' to '" + oldDir + "'."); + if (!Utility::MkDir(oldDir, 0700)) { std::ostringstream msgbuf; msgbuf << "mkdir() for path '" << oldDir << "'failed with error code " << errno << ", \"" << Utility::FormatErrorNumber(errno) << "\""; -- 2.40.0