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

Merge pull request #9725 from Icinga/operation_aborted-shutDownIfNeeded.Cancel

Browse Source 
ApiListener#NewClientHandlerInternal(): on basic_socket#cancel() (due to timeout) don't ssl::stream#async_shutdown()
This commit is contained in:
Julian Brost 2023-04-17 12:21:21 +02:00 committed by GitHub
commit 8238ec0d96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 49 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/remote/apilistener.cpp
View File

@ -734,6 +734,7 @@ void ApiListener::NewClientHandlerInternal(
ClientType ctype; ClientType ctype;
try {
if (role == RoleClient) { if (role == RoleClient) {
JsonRpc::SendMessage(client, new Dictionary({ JsonRpc::SendMessage(client, new Dictionary({
{ "jsonrpc", "2.0" }, { "jsonrpc", "2.0" },
@ -790,6 +791,13 @@ void ApiListener::NewClientHandlerInternal(
ctype = ClientHttp; ctype = ClientHttp;
} }
} }
} catch (const boost::system::system_error& systemError) {
if (systemError.code() == boost::asio::error::operation_aborted) {
shutDownIfNeeded.Cancel();
}
throw;
}
if (ctype == ClientJsonRpc) { if (ctype == ClientJsonRpc) {
Log(LogNotice, "ApiListener", "New JSON-RPC client"); Log(LogNotice, "ApiListener", "New JSON-RPC client");