Skip to content
Permalink
Browse files

Lower log level for unexpected behaviour

Its a possible mistake to log in to a server with twice the same name.
Before, it triggered a server wide error message, now it logs to actionstream.
  • Loading branch information
est31 committed May 18, 2015
1 parent d2ca662 commit 497299afd62e2f9b18dbf2a366bb22996e73102b
Showing with 8 additions and 8 deletions.
  1. +2 −2 src/network/serverpackethandler.cpp
  2. +6 −6 src/server.cpp
@@ -613,7 +613,7 @@ void Server::handleCommand_Init2(NetworkPacket* pkt)
playersao = StageTwoClientInit(pkt->getPeerId());

if (playersao == NULL) {
errorstream
actionstream
<< "TOSERVER_INIT2 stage 2 client init failed for peer "
<< pkt->getPeerId() << std::endl;
return;
@@ -710,7 +710,7 @@ void Server::handleCommand_ClientReady(NetworkPacket* pkt)
PlayerSAO* playersao = StageTwoClientInit(peer_id);

if (playersao == NULL) {
errorstream
actionstream
<< "TOSERVER_CLIENT_READY stage 2 client init failed for peer_id: "
<< peer_id << std::endl;
m_con.DisconnectPeer(peer_id);
@@ -1073,16 +1073,16 @@ PlayerSAO* Server::StageTwoClientInit(u16 peer_id)
static_cast<RemotePlayer*>(m_env->getPlayer(playername.c_str()));

// If failed, cancel
if((playersao == NULL) || (player == NULL)) {
if(player && player->peer_id != 0) {
errorstream<<"Server: "<<playername<<": Failed to emerge player"
<<" (player allocated to an another client)"<<std::endl;
if ((playersao == NULL) || (player == NULL)) {
if (player && player->peer_id != 0) {
actionstream << "Server: Failed to emerge player \"" << playername
<< "\" (player allocated to an another client)" << std::endl;
DenyAccess_Legacy(peer_id, L"Another client is connected with this "
L"name. If your client closed unexpectedly, try again in "
L"a minute.");
} else {
errorstream<<"Server: "<<playername<<": Failed to emerge player"
<<std::endl;
errorstream << "Server: " << playername << ": Failed to emerge player"
<< std::endl;
DenyAccess_Legacy(peer_id, L"Could not allocate player.");
}
return NULL;

2 comments on commit 497299a

@nerzhul

This comment has been minimized.

Copy link
Member

@nerzhul nerzhul replied May 19, 2015

Are you sure ? Actionstream is output to stdout.

@est31

This comment has been minimized.

Copy link
Contributor Author

@est31 est31 replied May 19, 2015

I think clients should never be abled to trigger a log message in errorstream.

Please sign in to comment.
You can’t perform that action at this time.