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

Re-add HttpServerConnection#Disconnect()

Browse Source
This commit is contained in:
Alexander A. Klimov 2019-02-20 14:56:12 +01:00
parent 16913cb977
commit f029fd4884
2 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
lib/remote/httpserverconnection.cpp
View File

@ -12,7 +12,6 @@
#include "base/configtype.hpp" #include "base/configtype.hpp"
#include "base/defer.hpp" #include "base/defer.hpp"
#include "base/exception.hpp" #include "base/exception.hpp"
#include "base/io-engine.hpp"
#include "base/logger.hpp" #include "base/logger.hpp"
#include "base/objectlock.hpp" #include "base/objectlock.hpp"
#include "base/timer.hpp" #include "base/timer.hpp"
@ -31,7 +30,7 @@ using namespace icinga;
auto const l_ServerHeader ("Icinga/" + Application::GetAppVersion()); auto const l_ServerHeader ("Icinga/" + Application::GetAppVersion());
HttpServerConnection::HttpServerConnection(const String& identity, bool authenticated, const std::shared_ptr<AsioTlsStream>& stream) HttpServerConnection::HttpServerConnection(const String& identity, bool authenticated, const std::shared_ptr<AsioTlsStream>& stream)
: m_Stream(stream) : m_Stream(stream), m_IoStrand(stream->get_io_service()), m_ShuttingDown(false)
{ {
if (authenticated) { if (authenticated) {
m_ApiUser = ApiUser::GetByClientCN(identity); m_ApiUser = ApiUser::GetByClientCN(identity);
@ -51,7 +50,43 @@ void HttpServerConnection::Start()
{ {
namespace asio = boost::asio; namespace asio = boost::asio;
asio::spawn(IoEngine::Get().GetIoService(), [this](asio::yield_context yc) { ProcessMessages(yc); }); HttpServerConnection::Ptr preventGc (this);
asio::spawn(m_IoStrand, [this, preventGc](asio::yield_context yc) { ProcessMessages(yc); });
}
void HttpServerConnection::Disconnect()
{
namespace asio = boost::asio;
HttpServerConnection::Ptr preventGc (this);
asio::spawn(m_IoStrand, [this, preventGc](asio::yield_context yc) {
if (!m_ShuttingDown) {
m_ShuttingDown = true;
Log(LogInformation, "HttpServerConnection")
<< "HTTP client disconnected (from " << m_PeerAddress << ")";
try {
m_Stream->next_layer().async_shutdown(yc);
} catch (...) {
}
try {
m_Stream->lowest_layer().shutdown(m_Stream->lowest_layer().shutdown_both);
} catch (...) {
}
auto listener (ApiListener::GetInstance());
if (listener) {
CpuBoundWork removeHttpClient (yc);
listener->RemoveHttpClient(this);
}
}
});
} }
static inline static inline
@ -357,23 +392,7 @@ 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 removeHttpClient ([this, &yc]() { Defer disconnect ([this]() { Disconnect(); });
auto listener (ApiListener::GetInstance());
if (listener) {
CpuBoundWork removeHttpClient (yc);
listener->RemoveHttpClient(this);
}
});
Defer shutdown ([this, &yc]() {
try {
m_Stream->next_layer().async_shutdown(yc);
} catch (...) {
// https://stackoverflow.com/questions/130117/throwing-exceptions-out-of-a-destructor
}
});
try { try {
beast::flat_buffer buf; beast::flat_buffer buf;
@ -440,7 +459,9 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
} }
} }
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
Log(LogCritical, "HttpServerConnection") if (!m_ShuttingDown) {
<< "Unhandled exception while processing HTTP request: " << DiagnosticInformation(ex); Log(LogCritical, "HttpServerConnection")
<< "Unhandled exception while processing HTTP request: " << DiagnosticInformation(ex);
}
} }
} }

4
lib/remote/httpserverconnection.hpp
View File

@ -7,6 +7,7 @@
#include "base/string.hpp" #include "base/string.hpp"
#include "base/tlsstream.hpp" #include "base/tlsstream.hpp"
#include <memory> #include <memory>
#include <boost/asio/io_service_strand.hpp>
#include <boost/asio/spawn.hpp> #include <boost/asio/spawn.hpp>
namespace icinga namespace icinga
@ -25,11 +26,14 @@ public:
HttpServerConnection(const String& identity, bool authenticated, const std::shared_ptr<AsioTlsStream>& stream); HttpServerConnection(const String& identity, bool authenticated, const std::shared_ptr<AsioTlsStream>& stream);
void Start(); void Start();
void Disconnect();
private: private:
ApiUser::Ptr m_ApiUser; ApiUser::Ptr m_ApiUser;
std::shared_ptr<AsioTlsStream> m_Stream; std::shared_ptr<AsioTlsStream> m_Stream;
String m_PeerAddress; String m_PeerAddress;
boost::asio::io_service::strand m_IoStrand;
bool m_ShuttingDown;
void ProcessMessages(boost::asio::yield_context yc); void ProcessMessages(boost::asio::yield_context yc);
}; };