Additional log messages.

This commit is contained in:
lotodore
2007-10-29 12:57:29 +00:00
parent 219a922c9e
commit 001ac0272b
3 changed files with 7 additions and 3 deletions
+2 -1
View File
@@ -148,7 +148,8 @@ ServerGameThread::Main()
LOG_ERROR(e.what()); LOG_ERROR(e.what());
} }
GetSender().SignalTermination(); 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(); ResetComputerPlayerList();
GetLobbyThread().RemoveGame(GetId()); GetLobbyThread().RemoveGame(GetId());
+4 -2
View File
@@ -269,7 +269,8 @@ ServerLobbyThread::Main()
TerminateGames(); TerminateGames();
GetSender().SignalTermination(); 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(); CleanupConnectQueue();
} }
@@ -708,7 +709,8 @@ ServerLobbyThread::RemoveGameLoop()
{ {
boost::shared_ptr<ServerGameThread> tmpGame = pos->second; boost::shared_ptr<ServerGameThread> tmpGame = pos->second;
tmpGame->SignalTermination(); 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); InternalRemoveGame(tmpGame);
} }
++i; ++i;
+1
View File
@@ -66,6 +66,7 @@
#define ERR_NET_INVALID_REQUEST_ID 122 #define ERR_NET_INVALID_REQUEST_ID 122
#define ERR_NET_WRONG_AVATAR_SIZE 123 #define ERR_NET_WRONG_AVATAR_SIZE 123
#define ERR_NET_START_TIMEOUT 124 #define ERR_NET_START_TIMEOUT 124
#define ERR_NET_GAME_TERMINATION_FAILED 125
#define ERR_IRC_INTERNAL 151 #define ERR_IRC_INTERNAL 151
#define ERR_IRC_CONNECT_FAILED 152 #define ERR_IRC_CONNECT_FAILED 152