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

JsonRpcConnection#Disconnect(): unregister the connection ASAP

Browse Source 
refs #7444
This commit is contained in:
Alexander A. Klimov 2019-08-23 17:14:13 +02:00
parent 8c739fe33b
commit c24312b870
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/remote/jsonrpcconnection.cpp
View File

@ -200,6 +200,16 @@ void JsonRpcConnection::Disconnect()
Log(LogWarning, "JsonRpcConnection") Log(LogWarning, "JsonRpcConnection")
<< "API client disconnected for identity '" << m_Identity << "'"; << "API client disconnected for identity '" << m_Identity << "'";
{
CpuBoundWork removeClient (yc);
if (m_Endpoint) {
m_Endpoint->RemoveClient(this);
} else {
ApiListener::GetInstance()->RemoveAnonymousClient(this);
}
}
m_OutgoingMessagesQueued.Set(); m_OutgoingMessagesQueued.Set();
m_WriterDone.Wait(yc); m_WriterDone.Wait(yc);
@ -221,15 +231,6 @@ void JsonRpcConnection::Disconnect()
m_CheckLivenessTimer.cancel(); m_CheckLivenessTimer.cancel();
m_HeartbeatTimer.cancel(); m_HeartbeatTimer.cancel();
CpuBoundWork removeClient (yc);
if (m_Endpoint) {
m_Endpoint->RemoveClient(this);
} else {
auto listener (ApiListener::GetInstance());
listener->RemoveAnonymousClient(this);
}
} }
}); });
} }