test/drogon
1
0
Fork 0
mirror of https://gitee.com/an-tao/drogon.git synced 2024-12-02 03:38:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix core dump causing by logging in destructor. (#1250)

Browse Source 
Co-authored-by: Martin Chang <marty1885@users.noreply.github.com>
Co-authored-by: an-tao <antao2002@gmail.com>
This commit is contained in:
Nitromelon 2022-05-18 13:13:59 +08:00 committed by antao
parent cd55a198d2
commit 3b11b80b10
6 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/src/HttpAppFrameworkImpl.cc
View File

@ -1012,7 +1012,19 @@ void HttpAppFrameworkImpl::quit()
if (getLoop()->isRunning())
{
getLoop()->queueInLoop([this]() {
// Release members in the reverse order of initialization
listenerManagerPtr_->stopListening();
websockCtrlsRouterPtr_.reset();
staticFileRouterPtr_.reset();
httpSimpleCtrlsRouterPtr_.reset();
httpCtrlsRouterPtr_.reset();
pluginsManagerPtr_.reset();
redisClientManagerPtr_.reset();
dbClientManagerPtr_.reset();
// TODO: let HttpAppFrameworkImpl manage IO loops
// and reset listenerManagerPtr_ before IO loops quit.
listenerManagerPtr_->stopIoLoops();
listenerManagerPtr_.reset();
getLoop()->quit();
});
}
@ -1119,15 +1131,16 @@ HttpAppFramework &HttpAppFrameworkImpl::setupFileLogger()
{
baseName = "drogon";
}
asyncFileLoggerPtr_ = std::make_unique<trantor::AsyncFileLogger>();
asyncFileLoggerPtr_ = std::make_shared<trantor::AsyncFileLogger>();
asyncFileLoggerPtr_->setFileName(baseName, ".log", logPath_);
asyncFileLoggerPtr_->startLogging();
trantor::Logger::setOutputFunction(
[this](const char *msg, const uint64_t len) {
asyncFileLoggerPtr_->output(msg, len);
},
[this]() { asyncFileLoggerPtr_->flush(); });
asyncFileLoggerPtr_->setFileSizeLimit(logfileSize_);
trantor::Logger::setOutputFunction(
[loggerPtr = asyncFileLoggerPtr_](const char *msg,
const uint64_t len) {
loggerPtr->output(msg, len);
},
[loggerPtr = asyncFileLoggerPtr_]() { loggerPtr->flush(); });
}
}
return *this;

20
lib/src/HttpAppFrameworkImpl.h
View File

@ -588,16 +588,16 @@ class HttpAppFrameworkImpl final : public HttpAppFramework
std::string serverHeader_{"server: drogon/" + drogon::getVersion() +
"\r\n"};
const std::unique_ptr<StaticFileRouter> staticFileRouterPtr_;
const std::unique_ptr<HttpControllersRouter> httpCtrlsRouterPtr_;
const std::unique_ptr<HttpSimpleControllersRouter>
httpSimpleCtrlsRouterPtr_;
const std::unique_ptr<WebsocketControllersRouter> websockCtrlsRouterPtr_;
std::unique_ptr<StaticFileRouter> staticFileRouterPtr_;
std::unique_ptr<HttpControllersRouter> httpCtrlsRouterPtr_;
std::unique_ptr<HttpSimpleControllersRouter> httpSimpleCtrlsRouterPtr_;
std::unique_ptr<WebsocketControllersRouter> websockCtrlsRouterPtr_;
std::unique_ptr<ListenerManager> listenerManagerPtr_;
std::unique_ptr<PluginsManager> pluginsManagerPtr_;
std::unique_ptr<orm::DbClientManager> dbClientManagerPtr_;
std::unique_ptr<nosql::RedisClientManager> redisClientManagerPtr_;
const std::unique_ptr<ListenerManager> listenerManagerPtr_;
const std::unique_ptr<PluginsManager> pluginsManagerPtr_;
const std::unique_ptr<orm::DbClientManager> dbClientManagerPtr_;
const std::unique_ptr<nosql::RedisClientManager> redisClientManagerPtr_;
std::string rootPath_{"./"};
std::string uploadPath_;
std::atomic_bool running_{false};
@ -641,7 +641,7 @@ class HttpAppFrameworkImpl final : public HttpAppFramework
std::function<void()> termSignalHandler_{[]() { app().quit(); }};
std::function<void()> intSignalHandler_{[]() { app().quit(); }};
std::unique_ptr<SessionManager> sessionManagerPtr_;
std::unique_ptr<trantor::AsyncFileLogger> asyncFileLoggerPtr_;
std::shared_ptr<trantor::AsyncFileLogger> asyncFileLoggerPtr_;
Json::Value jsonConfig_;
HttpResponsePtr custom404_;
std::function<HttpResponsePtr(HttpStatusCode)> customErrorHandler_ =

32
lib/src/ListenerManager.cc
View File

@ -268,20 +268,6 @@ void ListenerManager::stopListening()
{
serverPtr->stop();
}
for (auto loop : ioLoops_)
{
assert(!loop->isInLoopThread());
if (loop->isRunning())
{
std::promise<int> pro;
auto f = pro.get_future();
loop->queueInLoop([loop, &pro]() {
loop->quit();
pro.set_value(1);
});
(void)f.get();
}
}
#ifndef __linux__
for (auto &listenerLoopPtr : listeningloopThreads_)
{
@ -301,6 +287,24 @@ void ListenerManager::stopListening()
#endif
}
void ListenerManager::stopIoLoops()
{
for (auto loop : ioLoops_)
{
assert(!loop->isInLoopThread());
if (loop->isRunning())
{
std::promise<int> pro;
auto f = pro.get_future();
loop->queueInLoop([loop, &pro]() {
loop->quit();
pro.set_value(1);
});
(void)f.get();
}
}
}
std::vector<trantor::InetAddress> ListenerManager::getListeners() const
{
std::vector<trantor::InetAddress> listeners;

1
lib/src/ListenerManager.h
View File

@ -59,6 +59,7 @@ class ListenerManager : public trantor::NonCopyable
trantor::EventLoop *getIOLoop(size_t id) const;
void stopListening();
void stopIoLoops();
std::vector<trantor::EventLoop *> ioLoops_;
private:

16
lib/src/StaticFileRouter.cc
View File

@ -37,8 +37,8 @@ using namespace drogon;
void StaticFileRouter::init(const std::vector<trantor::EventLoop *> &ioloops)
{
// Max timeout up to about 70 days;
staticFilesCacheMap_ = decltype(staticFilesCacheMap_)(
new IOThreadStorage<std::unique_ptr<CacheMap<std::string, char>>>);
staticFilesCacheMap_ = std::make_unique<
IOThreadStorage<std::unique_ptr<CacheMap<std::string, char>>>>();
staticFilesCacheMap_->init(
[&ioloops](std::unique_ptr<CacheMap<std::string, char>> &mapPtr,
size_t i) {
@ -46,14 +46,16 @@ void StaticFileRouter::init(const std::vector<trantor::EventLoop *> &ioloops)
mapPtr = std::unique_ptr<CacheMap<std::string, char>>(
new CacheMap<std::string, char>(ioloops[i], 1.0, 4, 50));
});
staticFilesCache_ = decltype(staticFilesCache_)(
new IOThreadStorage<
std::unordered_map<std::string, HttpResponsePtr>>{});
staticFilesCache_ = std::make_unique<
IOThreadStorage<std::unordered_map<std::string, HttpResponsePtr>>>();
ioLocationsPtr_ =
decltype(ioLocationsPtr_)(new IOThreadStorage<std::vector<Location>>);
std::make_shared<IOThreadStorage<std::vector<Location>>>();
for (auto *loop : ioloops)
{
loop->queueInLoop([this] { **ioLocationsPtr_ = locations_; });
loop->queueInLoop(
[ioLocationsPtr = ioLocationsPtr_, locations = locations_] {
**ioLocationsPtr = locations;
});
}
}

2
lib/src/StaticFileRouter.h
View File

@ -169,7 +169,7 @@ class StaticFileRouter
}
}
};
std::unique_ptr<IOThreadStorage<std::vector<Location>>> ioLocationsPtr_;
std::shared_ptr<IOThreadStorage<std::vector<Location>>> ioLocationsPtr_;
std::vector<Location> locations_;
};
} // namespace drogon