1
This commit is contained in:
parent
c748f8fa52
commit
a244248901
@ -3,6 +3,7 @@
|
||||
#include <unistd.h>
|
||||
|
||||
#include <a8/openssl.h>
|
||||
#include <a8/mutable_xobject.h>
|
||||
|
||||
#include <f8/timer.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;
|
||||
conn.lock()->SendMsg(req->socket_handle, msg);
|
||||
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);
|
||||
}
|
||||
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)
|
||||
{
|
||||
if (a8::TIMER_EXEC_EVENT == event) {
|
||||
MasterMgr::Instance()->RemoveHttpTunnelRequest(req->socket_handle);
|
||||
} else if (ALLOC_TARGET_SERVER_SUCCESS_TIMER_EVENT == event) {
|
||||
req->request->GetResp()->SetVal("errcode", 0);
|
||||
req->request->GetResp()->SetVal("errmsg", "");
|
||||
req->request->Response();
|
||||
MasterMgr::Instance()->RemoveHttpTunnelRequest(req->socket_handle);
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user