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

Merge pull request #7485 from Icinga/bugfix/api-disconnect-defer

Browse Source 
Avoid the Defer-Disconnect destructor pattern with Boost.Coroutines
This commit is contained in:
Michael Friedrich 2019-09-09 11:41:34 +02:00 committed by GitHub
commit b3c48e7520
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/remote/apilistener.cpp
View File

@ -553,7 +553,10 @@ void ApiListener::NewClientHandlerInternal(boost::asio::yield_context yc, const
Defer shutDownIfNeeded ([&sslConn, &willBeShutDown, &yc]() { Defer shutDownIfNeeded ([&sslConn, &willBeShutDown, &yc]() {
if (!willBeShutDown) { if (!willBeShutDown) {
sslConn.async_shutdown(yc); // Ignore the error, but do not throw an exception being swallowed at all cost.
// https://github.com/Icinga/icinga2/issues/7351
boost::system::error_code ec;
sslConn.async_shutdown(yc[ec]);
} }
}); });

4
lib/remote/httpserverconnection.cpp
View File

@ -472,8 +472,6 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
namespace beast = boost::beast; namespace beast = boost::beast;
namespace http = beast::http; namespace http = beast::http;
Defer disconnect ([this]() { Disconnect(); });
try { try {
beast::flat_buffer buf; beast::flat_buffer buf;
@ -557,6 +555,8 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
<< "Unhandled exception while processing HTTP request: " << ex.what(); << "Unhandled exception while processing HTTP request: " << ex.what();
} }
} }
Disconnect();
} }
void HttpServerConnection::CheckLiveness(boost::asio::yield_context yc) void HttpServerConnection::CheckLiveness(boost::asio::yield_context yc)

8
lib/remote/jsonrpcconnection.cpp
View File

@ -60,8 +60,6 @@ void JsonRpcConnection::Start()
void JsonRpcConnection::HandleIncomingMessages(boost::asio::yield_context yc) void JsonRpcConnection::HandleIncomingMessages(boost::asio::yield_context yc)
{ {
Defer disconnect ([this]() { Disconnect(); });
for (;;) { for (;;) {
String message; String message;
@ -97,12 +95,12 @@ void JsonRpcConnection::HandleIncomingMessages(boost::asio::yield_context yc)
l_TaskStats.InsertValue(Utility::GetTime(), 1); l_TaskStats.InsertValue(Utility::GetTime(), 1);
} }
Disconnect();
} }
void JsonRpcConnection::WriteOutgoingMessages(boost::asio::yield_context yc) void JsonRpcConnection::WriteOutgoingMessages(boost::asio::yield_context yc)
{ {
Defer disconnect ([this]() { Disconnect(); });
Defer signalWriterDone ([this]() { m_WriterDone.Set(); }); Defer signalWriterDone ([this]() { m_WriterDone.Set(); });
do { do {
@ -136,6 +134,8 @@ void JsonRpcConnection::WriteOutgoingMessages(boost::asio::yield_context yc)
} }
} }
} while (!m_ShuttingDown); } while (!m_ShuttingDown);
Disconnect();
} }
double JsonRpcConnection::GetTimestamp() const double JsonRpcConnection::GetTimestamp() const