diff --git a/server/wsproxy/CMakeLists.txt b/server/wsproxy/CMakeLists.txt index 07fe17f..16d6c05 100644 --- a/server/wsproxy/CMakeLists.txt +++ b/server/wsproxy/CMakeLists.txt @@ -16,9 +16,10 @@ else() endif() set(CMAKE_BUILD_TYPE "Debug") -set(CMAKE_BUILD_TYPE "Release") +#set(CMAKE_BUILD_TYPE "Release") set(CMAKE_CXX_FLAGS_RELEASE "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DMASTER_MODE=${MASTER_MODE} -DA8_TCP_SESSION2=1") set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DMASTER_MODE=${MASTER_MODE} -DA8_TCP_SESSION2=1") +set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DA8_TCP_SESSION2=1") include_directories( AFTER diff --git a/server/wsproxy/app.cc b/server/wsproxy/app.cc index afa3b61..b8709a5 100644 --- a/server/wsproxy/app.cc +++ b/server/wsproxy/app.cc @@ -120,7 +120,9 @@ bool App::Init(int argc, char* argv[]) uuid.SetMachineId(instance_id); #endif GameClientMgr::Instance()->Init(); +#if MASTER_MODE MasterSvrMgr::Instance()->Init(); +#endif TargetConnMgr::Instance()->Init(); GCListener::Instance()->Init(); @@ -155,7 +157,9 @@ void App::UnInit() { a8::XPrintf("wsproxy terminating instance_id:%d pid:%d\n", {instance_id, getpid()}); GCListener::Instance()->UnInit(); +#ifdef MASTER_MODE MasterSvrMgr::Instance()->UnInit(); +#endif TargetConnMgr::Instance()->UnInit(); GameClientMgr::Instance()->UnInit(); JsonDataMgr::Instance()->UnInit(); @@ -455,7 +459,9 @@ void App::ProcessIMMsg() case IM_ClientSocketDisconnect: { GameClientMgr::Instance()->OnClientDisconnect(pdelnode->params); +#ifdef MASTER_MODE MasterSvrMgr::Instance()->RemoveRequest(pdelnode->params.param1, pdelnode->params.sender); +#endif } break; case IM_TargetConnConnect: