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

/v1/events: don't deadlock other coroutines

This commit is contained in:
Alexander A. Klimov 2019-04-05 09:22:42 +02:00
parent 2e5af2922b
commit 2e4e2e1a79
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/remote/eventshandler.cpp
View File

@ -101,6 +101,7 @@ bool EventsHandler::HandleRequest(
} }
asio::const_buffer newLine ("\n", 1); asio::const_buffer newLine ("\n", 1);
AsioConditionVariable dontLockOwnStrand (stream.get_io_service(), true);
for (;;) { for (;;) {
auto event (queue->WaitForEvent(&request, yc)); auto event (queue->WaitForEvent(&request, yc));
@ -119,6 +120,8 @@ bool EventsHandler::HandleRequest(
stream.async_flush(yc); stream.async_flush(yc);
} else if (server.Disconnected()) { } else if (server.Disconnected()) {
return true; return true;
} else {
dontLockOwnStrand.Wait(yc);
} }
} }
} }