Rooba
/
drogon
mirror of https://github.com/drogonframework/drogon.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update trantor using kqueue in MacOS

This commit is contained in:
antao 2018-12-19 13:58:35 +08:00
parent ee4853d8f8
commit 2126d1a394
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/HttpAppFrameworkImpl.cc
View File

@ -351,6 +351,7 @@ void HttpAppFrameworkImpl::run()
#ifdef __linux__
_loop.resetTimerQueue();
#endif
_loop.resetAfterFork();
}
//set relaunching
if (_relaunchOnError)
@ -373,6 +374,7 @@ void HttpAppFrameworkImpl::run()
sleep(1);
LOG_INFO << "start new process";
}
_loop.resetAfterFork();
}
//set logger

4
lib/src/HttpAppFrameworkImpl.h
View File

@ -93,8 +93,8 @@ class HttpAppFrameworkImpl : public HttpAppFramework
virtual trantor::EventLoop *loop() override;
virtual void quit() override
{
assert(_loop.isRunning());
_loop.quit();
if (_loop.isRunning())
_loop.quit();
}
#if USE_ORM
virtual orm::DbClientPtr getDbClient(const std::string &name = "default") override;

2
trantor

@ -1 +1 @@
Subproject commit 4dade42572b5fc053b4dbe21eede15d5b0f55197
Subproject commit 49c6311642f38070d34dd1a4f0408f8f41a5ebfc