lywsvip/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-05-06 23:33:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复http api可能导致死锁的bug

Browse Source
This commit is contained in:
ziyuexiachu
2025-02-26 11:32:10 +08:00
parent cd7f7fb5ea
commit 52ca731392
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
server/WebApi.cpp
View File

@@ -293,22 +293,24 @@ static inline void addHttpListener(){
};
((HttpSession::HttpResponseInvoker &) invoker) = newInvoker;
}
try {
it->second(parser, invoker, sender);
} catch (ApiRetException &ex) {
responseApi(ex.code(), ex.what(), invoker);
auto helper = static_cast<SocketHelper &>(sender).shared_from_this();
helper->getPoller()->async([helper, ex]() { helper->shutdown(SockException(Err_shutdown, ex.what())); }, false);
}
auto helper = static_cast<SocketHelper &>(sender).shared_from_this();
// 在本poller线程下一次事件循环时执行http api，防止占用NoticeCenter的锁
helper->getPoller()->async([it, parser, invoker, helper]() {
try {
it->second(parser, invoker, *helper);
} catch (ApiRetException &ex) {
responseApi(ex.code(), ex.what(), invoker);
helper->getPoller()->async([helper, ex]() { helper->shutdown(SockException(Err_shutdown, ex.what())); }, false);
}
#ifdef ENABLE_MYSQL
catch(SqlException &ex){
responseApi(API::SqlFailed, StrPrinter << "操作数据库失败:" << ex.what() << ":" << ex.getSql(), invoker);
}
#endif// ENABLE_MYSQL
catch (std::exception &ex) {
responseApi(API::Exception, ex.what(), invoker);
}
catch (SqlException &ex) {
responseApi(API::SqlFailed, StrPrinter << "操作数据库失败:" << ex.what() << ":" << ex.getSql(), invoker);
}
#endif // ENABLE_MYSQL
catch (std::exception &ex) {
responseApi(API::Exception, ex.what(), invoker);
}
},false);
});
}