From 001ac0272bd6f14b862da8028941abc86a64b33c Mon Sep 17 00:00:00 2001 From: lotodore Date: Mon, 29 Oct 2007 12:57:29 +0000 Subject: [PATCH] Additional log messages. --- src/net/common/servergamethread.cpp | 3 ++- src/net/common/serverlobbythread.cpp | 6 ++++-- src/net/socket_msg.h | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/net/common/servergamethread.cpp b/src/net/common/servergamethread.cpp index b7b621cf..0ba0d6c8 100644 --- a/src/net/common/servergamethread.cpp +++ b/src/net/common/servergamethread.cpp @@ -148,7 +148,8 @@ ServerGameThread::Main() LOG_ERROR(e.what()); } GetSender().SignalTermination(); - GetSender().Join(SENDER_THREAD_TERMINATE_TIMEOUT); + if (!GetSender().Join(SENDER_THREAD_TERMINATE_TIMEOUT)) + LOG_ERROR("Fatal error: Unable to terminated Sender Thread in Game."); ResetComputerPlayerList(); GetLobbyThread().RemoveGame(GetId()); diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp index 68f9beb2..b4153f0d 100644 --- a/src/net/common/serverlobbythread.cpp +++ b/src/net/common/serverlobbythread.cpp @@ -269,7 +269,8 @@ ServerLobbyThread::Main() TerminateGames(); GetSender().SignalTermination(); - GetSender().Join(SENDER_THREAD_TERMINATE_TIMEOUT); + if (!GetSender().Join(SENDER_THREAD_TERMINATE_TIMEOUT)) + LOG_ERROR("Fatal error: Unable to terminated Sender Thread in Lobby."); CleanupConnectQueue(); } @@ -708,7 +709,8 @@ ServerLobbyThread::RemoveGameLoop() { boost::shared_ptr tmpGame = pos->second; tmpGame->SignalTermination(); - tmpGame->Join(GAME_THREAD_TERMINATE_TIMEOUT); + if (!tmpGame->Join(GAME_THREAD_TERMINATE_TIMEOUT)) + throw ServerException(__FILE__, __LINE__, ERR_NET_GAME_TERMINATION_FAILED, 0); InternalRemoveGame(tmpGame); } ++i; diff --git a/src/net/socket_msg.h b/src/net/socket_msg.h index 62d460bd..3a22873d 100644 --- a/src/net/socket_msg.h +++ b/src/net/socket_msg.h @@ -66,6 +66,7 @@ #define ERR_NET_INVALID_REQUEST_ID 122 #define ERR_NET_WRONG_AVATAR_SIZE 123 #define ERR_NET_START_TIMEOUT 124 +#define ERR_NET_GAME_TERMINATION_FAILED 125 #define ERR_IRC_INTERNAL 151 #define ERR_IRC_CONNECT_FAILED 152