diff options
author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-24 21:04:46 +0100 |
---|---|---|
committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-24 21:07:48 +0100 |
commit | 802eb61090abaf245617bc136ea21303af1c71b9 (patch) | |
tree | f79641e4188c53270a383e249931e37e22e3d328 | |
parent | dd20c7f6148cc8b8b627028e25e817cc1cab063b (diff) | |
download | manaserv-802eb61090abaf245617bc136ea21303af1c71b9.tar.gz manaserv-802eb61090abaf245617bc136ea21303af1c71b9.tar.xz manaserv-802eb61090abaf245617bc136ea21303af1c71b9.zip |
Fixed default value of the servername
Since the name was used to log things and the default now is "" also added
logging of the address and port too.
-rw-r--r-- | src/account-server/serverhandler.cpp | 3 | ||||
-rw-r--r-- | src/game-server/accountconnection.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp index 3260f44..024266b 100644 --- a/src/account-server/serverhandler.cpp +++ b/src/account-server/serverhandler.cpp @@ -247,7 +247,8 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg) // Map variables outMsg.writeInt16(id); - LOG_DEBUG("Issued server '" << server->name << "' " + LOG_DEBUG("Issued server " << server->name << "(" + << server->address << ":" << server->port << ") " << "to enable map " << id); std::map<std::string, std::string> variables; variables = storage->getAllWorldStateVars(id); diff --git a/src/game-server/accountconnection.cpp b/src/game-server/accountconnection.cpp index 0507eb0..8b517f5 100644 --- a/src/game-server/accountconnection.cpp +++ b/src/game-server/accountconnection.cpp @@ -78,7 +78,7 @@ bool AccountConnection::start(int gameServerPort) LOG_INFO("Connection established to the account server."); const std::string gameServerName = - Configuration::getValue("net_gameServerName", "server1"); + Configuration::getValue("net_gameServerName", std::string()); const std::string gameServerAddress = Configuration::getValue("net_publicGameHost", Configuration::getValue("net_gameHost", |