commit

startHj · Sep 30, 2020 · f6f84f7 · f6f84f7
1 parent e041ceb
commit f6f84f7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/Server/Src/LogServer/GameService.cpp b/Server/Src/LogServer/GameService.cpp
@@ -37,7 +37,7 @@ BOOL CGameService::Init()
 		return FALSE;
 	}
 
-	if (CommonFunc::IsAlreadyRun("LogServer" + CConfigFile::GetInstancePtr()->GetIntValue("areaid")))
+	if (CommonFunc::IsAlreadyRun("LogServer" + CConfigFile::GetInstancePtr()->GetStringValue("areaid")))
 	{
 		return FALSE;
 	}

diff --git a/Server/Src/LoginServer/LoginMsgHandler.cpp b/Server/Src/LoginServer/LoginMsgHandler.cpp
@@ -309,6 +309,11 @@ BOOL CLoginMsgHandler::OnMsgLogicSvrRegReq(NetPacket* pPacket)
 	LogicRegToLoginAck Ack;
 	Ack.set_retcode(MRC_SUCCESSED);
 	ServiceBase::GetInstancePtr()->SendMsgProtoBuf(pPacket->m_dwConnID, MSG_LOGIC_REGTO_LOGIN_ACK, 0, 0, Ack);
+
+	CConnection* pConnection = ServiceBase::GetInstancePtr()->GetConnectionByID(pPacket->m_dwConnID);
+	ERROR_RETURN_TRUE(pConnection != NULL);
+	pConnection->SetConnectionData(1);
+
 	return TRUE;
 }
 

diff --git a/Server/Src/ServerEngine/ServiceBase.cpp b/Server/Src/ServerEngine/ServiceBase.cpp
@@ -179,8 +179,6 @@ BOOL ServiceBase::Update()
 		m_dwLastTick = CommonFunc::GetTickCount();
 	}
 
-	//CConnectionMgr::GetInstancePtr()->CheckConntionAvalible();
-
 	m_QueueLock.Lock();
 	std::swap(m_pRecvDataQueue, m_pDispathQueue);
 	m_QueueLock.Unlock();

diff --git a/Server/Src/ServerEngine/SharedMemory.h b/Server/Src/ServerEngine/SharedMemory.h
@@ -268,6 +268,7 @@ template <typename T> class DataWriter : public DataWriterBase
 		}
 
 		m_nErrorCount = 0;
+		UINT64 uTickStart = CommonFunc::GetTickCount();
 
 		INT32 nCreateCount = 0, nUpdateCount = 0, nDeleteCount = 0, nRealseCount = 0;
 		BOOL hasOprate = false;
@@ -391,9 +392,10 @@ template <typename T> class DataWriter : public DataWriterBase
 			}
 		}
 
+		UINT64 uTickEnd = CommonFunc::GetTickCount();
 		if(nCreateCount > 0 || nCreateCount > 0 || nUpdateCount > 0 || nDeleteCount > 0 || nRealseCount > 0 || m_nErrorCount > 0)
 		{
-			CLog::GetInstancePtr()->LogInfo("ModuleID:[%02d]--Create:[%d]--Update:[%d]--Delete:[%d]--Release:[%d]--Error:[%d]", m_nModuleID, nCreateCount, nUpdateCount, nDeleteCount, nRealseCount, m_nErrorCount);
+			CLog::GetInstancePtr()->LogInfo("ModuleID:[%02d]--Create:[%d]--Update:[%d]--Delete:[%d]--Release:[%d]--Error:[%d]--Time:[%d]", m_nModuleID, nCreateCount, nUpdateCount, nDeleteCount, nRealseCount, m_nErrorCount, uTickEnd - uTickStart);
 		}
 
 		return hasOprate;

diff --git a/Server/Src/WatchServer/GameService.cpp b/Server/Src/WatchServer/GameService.cpp
@@ -34,7 +34,7 @@ BOOL CGameService::Init()
 		return FALSE;
 	}
 
-	if (CommonFunc::IsAlreadyRun("WatchServer" + CConfigFile::GetInstancePtr()->GetIntValue("areaid")))
+	if (CommonFunc::IsAlreadyRun("WatchServer" + CConfigFile::GetInstancePtr()->GetStringValue("areaid")))
 	{
 		return FALSE;
 	}