tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock in {HttpServerConnection,JsonRpcConnection}::DataAvailableHandler 

refs #11014
This commit is contained in:
Gunnar Beutner 2016-02-01 08:35:55 +01:00
parent c2cf614d62
commit deac316a45
2 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/remote/httpserverconnection.cpp
View File

@ -78,7 +78,8 @@ void HttpServerConnection::Disconnect(void)
ApiListener::Ptr listener = ApiListener::GetInstance(); ApiListener::Ptr listener = ApiListener::GetInstance();
listener->RemoveHttpClient(this); listener->RemoveHttpClient(this);
m_Stream->Shutdown(); if (!m_Stream->IsEof())
m_Stream->Shutdown();
} }
bool HttpServerConnection::ProcessMessage(void) bool HttpServerConnection::ProcessMessage(void)
@ -196,21 +197,24 @@ void HttpServerConnection::ProcessMessageAsync(HttpRequest& request)
void HttpServerConnection::DataAvailableHandler(void) void HttpServerConnection::DataAvailableHandler(void)
{ {
boost::mutex::scoped_lock lock(m_DataHandlerMutex); bool close = false;
try { if (!m_Stream->IsEof()) {
while (ProcessMessage()) boost::mutex::scoped_lock lock(m_DataHandlerMutex);
; /* empty loop body */
} catch (const std::exception& ex) {
Log(LogWarning, "HttpServerConnection")
<< "Error while reading Http request: " << DiagnosticInformation(ex);
Disconnect(); try {
while (ProcessMessage())
; /* empty loop body */
} catch (const std::exception& ex) {
Log(LogWarning, "HttpServerConnection")
<< "Error while reading Http request: " << DiagnosticInformation(ex);
return; close = true;
} }
} else
close = true;
if (m_Stream->IsEof()) if (close)
Disconnect(); Disconnect();
} }

29
lib/remote/jsonrpcconnection.cpp
View File

@ -227,22 +227,27 @@ bool JsonRpcConnection::ProcessMessage(void)
void JsonRpcConnection::DataAvailableHandler(void) void JsonRpcConnection::DataAvailableHandler(void)
{ {
boost::mutex::scoped_lock lock(m_DataHandlerMutex); bool close = false;
try { if (!m_Stream->IsEof()) {
while (ProcessMessage()) boost::mutex::scoped_lock lock(m_DataHandlerMutex);
; /* empty loop body */
} catch (const std::exception& ex) {
Log(LogWarning, "JsonRpcConnection")
<< "Error while reading JSON-RPC message for identity '" << m_Identity
<< "': " << DiagnosticInformation(ex);
Disconnect(); try {
while (ProcessMessage())
; /* empty loop body */
} catch (const std::exception& ex) {
Log(LogWarning, "JsonRpcConnection")
<< "Error while reading JSON-RPC message for identity '" << m_Identity
<< "': " << DiagnosticInformation(ex);
return; Disconnect();
}
if (m_Stream->IsEof()) return;
}
} else
close = true;
if (close)
Disconnect(); Disconnect();
} }