Merge branch 'master' into cors_macro_draft

This commit is contained in:
Benedikt-Alexander Mokroß 2019-09-27 17:52:48 +02:00
commit 59e377630d

View File

@ -152,7 +152,7 @@ void IOEventWorker::waitEvents() {
struct epoll_event* outEvents = (struct epoll_event*)m_outEvents.get();
auto eventsCount = epoll_wait(m_eventQueueHandle, outEvents, MAX_EVENTS, -1);
if(eventsCount < 0) {
if((eventsCount < 0) && (errno != EINTR)) {
OATPP_LOGE("[oatpp::async::worker::IOEventWorker::waitEvents()]", "Error. errno=%d", errno);
throw std::runtime_error("[oatpp::async::worker::IOEventWorker::waitEvents()]: Error. Event loop failed.");
}
@ -264,4 +264,4 @@ void IOEventWorker::waitEvents() {
}}}
#endif // #ifdef OATPP_IO_EVENT_INTERFACE_EPOLL
#endif // #ifdef OATPP_IO_EVENT_INTERFACE_EPOLL