server_common/wsproxy
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2024-03-24 19:52:35 +08:00
parent c748f8fa52
commit a244248901
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/wsproxy/mastermgr.cc
View File

@ -3,6 +3,7 @@
#include <unistd.h> #include <unistd.h>
#include <a8/openssl.h> #include <a8/openssl.h>
#include <a8/mutable_xobject.h>
#include <f8/timer.h> #include <f8/timer.h>
#include <f8/netmsghandler.h> #include <f8/netmsghandler.h>
@ -127,9 +128,6 @@ void MasterMgr::_SS_MS_HttpTunnelResponse(f8::MsgHdr* hdr, const ss::SS_MS_HttpT
ss::SS_HttpTunnelRequest msg; ss::SS_HttpTunnelRequest msg;
conn.lock()->SendMsg(req->socket_handle, msg); conn.lock()->SendMsg(req->socket_handle, msg);
if (!req->timer_wp.expired()) { if (!req->timer_wp.expired()) {
f8::Timer::Instance()->FireEvent(req->timer_wp,
ALLOC_TARGET_SERVER_SUCCESS_TIMER_EVENT,
nullptr);
f8::Timer::Instance()->Delete(req->timer_wp); f8::Timer::Instance()->Delete(req->timer_wp);
} }
RemoveHttpTunnelRequest(req->socket_handle); RemoveHttpTunnelRequest(req->socket_handle);
@ -312,8 +310,9 @@ void MasterMgr::AddHttpTunnelRequest(int socket_handle, std::shared_ptr<f8::Json
[req] (int event, const a8::Args* args) [req] (int event, const a8::Args* args)
{ {
if (a8::TIMER_EXEC_EVENT == event) { if (a8::TIMER_EXEC_EVENT == event) {
MasterMgr::Instance()->RemoveHttpTunnelRequest(req->socket_handle); req->request->GetResp()->SetVal("errcode", 0);
} else if (ALLOC_TARGET_SERVER_SUCCESS_TIMER_EVENT == event) { req->request->GetResp()->SetVal("errmsg", "");
req->request->Response();
MasterMgr::Instance()->RemoveHttpTunnelRequest(req->socket_handle); MasterMgr::Instance()->RemoveHttpTunnelRequest(req->socket_handle);
} }
} }