]> granicus.if.org Git - icinga2/commitdiff
/v1/events: remove anti-deadlock hack
authorAlexander A. Klimov <alexander.klimov@icinga.com>
Fri, 5 Apr 2019 15:36:50 +0000 (17:36 +0200)
committerMichael Friedrich <michael.friedrich@icinga.com>
Thu, 25 Apr 2019 13:56:38 +0000 (15:56 +0200)
lib/remote/eventshandler.cpp

index 38326e2a50707267060687c83ccad63c1dd57883..5ac1062df2d8bb0f353ad85784a46f1fce0f4b9c 100644 (file)
@@ -110,7 +110,6 @@ bool EventsHandler::HandleRequest(
        }
 
        asio::const_buffer newLine ("\n", 1);
-       AsioConditionVariable dontLockOwnStrand (stream.get_io_service(), true);
 
        for (;;) {
                auto event (subscriber.GetInbox()->Shift(yc));
@@ -129,8 +128,6 @@ bool EventsHandler::HandleRequest(
                        stream.async_flush(yc);
                } else if (server.Disconnected()) {
                        return true;
-               } else {
-                       dontLockOwnStrand.Wait(yc);
                }
        }
 }