Removed log level argument from LOG_FATAL helper macro, with the assumption

that fatal messages should always have highest log level.

2 files changed, 10 insertions, 7 deletions

diff --git a/src/account-server/main-account.cpp b/src/account-server/main-account.cpp
index 87fe68b8..1d83020b 100644
--- a/src/account-server/main-account.cpp
+++ b/src/account-server/main-account.cpp
@@ -147,7 +147,7 @@ void initialize()
 
     // --- Initialize enet.
     if (enet_initialize() != 0) {
-        LOG_FATAL("An error occurred while initializing ENet", 0);
+        LOG_FATAL("An error occurred while initializing ENet");
         exit(2);
     }
 
@@ -277,7 +277,7 @@ int main(int argc, char *argv[])
     if (!accountHandler->startListen(port) ||
         !serverHandler->startListen(port + 1) ||
         !chatHandler->startListen(port + 2)) {
-        LOG_ERROR("Unable to create an ENet server host.", 0);
+        LOG_FATAL("Unable to create an ENet server host.");
         return 3;
     }
 
diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp
index b7e51bce..572492e7 100644
--- a/src/account-server/serverhandler.cpp
+++ b/src/account-server/serverhandler.cpp
@@ -60,7 +60,8 @@ void ServerHandler::computerDisconnected(NetComputer *comp)
     delete comp;
 }
 
-bool ServerHandler::getGameServerFromMap(unsigned mapId, std::string &address, short &port)
+bool ServerHandler::getGameServerFromMap(unsigned mapId, std::string &address,
+                                         short &port)
 {
     Servers::const_iterator i = servers.find(mapId);
     if (i == servers.end()) return false;
@@ -97,7 +98,7 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
             LOG_INFO("Game server " << address << ':' << port
                      << " wants to register " << (msg.getUnreadLength() / 2)
                      << " maps.", 0);
-            
+
             while (msg.getUnreadLength())
             {
                 int id = msg.readShort();
@@ -135,7 +136,8 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
             PlayerPtr ptr = store.getCharacter(id);
             std::string address;
             short port;
-            if (serverHandler->getGameServerFromMap(ptr->getMap(), address, port))
+            if (serverHandler->getGameServerFromMap(ptr->getMap(), address,
+                                                    port))
             {
                 registerGameClient(magic_token, ptr);
                 result.writeShort(AGMSG_REDIRECT_RESPONSE);
@@ -146,12 +148,13 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
             }
             else
             {
-                LOG_ERROR("Server Change: No game server for the map.", 0);
+                LOG_ERROR("Server Change: No game server for map " <<
+                        ptr->getMap() << ".", 0);
             }
         } break;
 
         default:
-            LOG_WARN("Invalid message type.", 0);
+            LOG_WARN("Invalid message type: " << msg.getId(), 0);
             result.writeShort(XXMSG_INVALID);
             break;
     }