Changed the stat file name to attributes.xml.

I also made it required to start properly since it's now the case.

Reviewed-by: Jaxad0127.

3 files changed, 15 insertions, 11 deletions

diff --git a/src/account-server/accounthandler.cpp b/src/account-server/accounthandler.cpp
index 0acd3f52..af04119a 100644
--- a/src/account-server/accounthandler.cpp
+++ b/src/account-server/accounthandler.cpp
@@ -43,8 +43,6 @@
 #include "utils/string.hpp"
 #include "utils/xml.hpp"
 
-#define DEFAULT_ATTRIBUTEDB_FILE            "stats.xml"
-
 static void addUpdateHost(MessageOut *msg)
 {
     std::string updateHost = Configuration::getValue("defaultUpdateHost", "");
@@ -130,7 +128,8 @@ AccountHandler::AccountHandler(const std::string &attrFile):
 
         absPathFile = ResourceManager::resolve(attrFile);
         if (absPathFile.empty()) {
-            LOG_ERROR("Account handler: Could not find " << attrFile << "!");
+            LOG_FATAL("Account handler: Could not find " << attrFile << "!");
+            exit(3);
             return;
         }
 
@@ -139,8 +138,9 @@ AccountHandler::AccountHandler(const std::string &attrFile):
 
         if (!node || !xmlStrEqual(node->name, BAD_CAST "stats"))
         {
-            LOG_ERROR("Account handler: " << attrFile
+            LOG_FATAL("Account handler: " << attrFile
                       << " is not a valid database file!");
+            exit(3);
             return;
         }
         for_each_xml_child_node(attributenode, node)
@@ -150,9 +150,10 @@ AccountHandler::AccountHandler(const std::string &attrFile):
     }
 }
 
-bool AccountClientHandler::initialize(int port, const std::string &host)
+bool AccountClientHandler::initialize(const std::string &configFile, int port,
+                                      const std::string &host)
 {
-    accountHandler = new AccountHandler(DEFAULT_ATTRIBUTEDB_FILE);
+    accountHandler = new AccountHandler(configFile);
     LOG_INFO("Account handler started:");
 
     return accountHandler->startListen(port, host);
diff --git a/src/account-server/accounthandler.hpp b/src/account-server/accounthandler.hpp
index 5fa2a06f..f1ffcfe2 100644
--- a/src/account-server/accounthandler.hpp
+++ b/src/account-server/accounthandler.hpp
@@ -28,7 +28,8 @@ namespace AccountClientHandler
     /**
      * Creates a connection handler and starts listening on given port.
      */
-    bool initialize(int port, const std::string &host);
+    bool initialize(const std::string &configFile, int port,
+                    const std::string &host);
 
     /**
      * Stops listening to messages and destroys the connection handler.
diff --git a/src/account-server/main-account.cpp b/src/account-server/main-account.cpp
index e43f1a65..a059c38e 100644
--- a/src/account-server/main-account.cpp
+++ b/src/account-server/main-account.cpp
@@ -50,9 +50,10 @@
 using utils::Logger;
 
 // Default options that automake should be able to override.
-#define DEFAULT_LOG_FILE        "manaserv-account.log"
-#define DEFAULT_STATS_FILE      "manaserv.stats"
-#define DEFAULT_CONFIG_FILE     "manaserv.xml"
+#define DEFAULT_LOG_FILE          "manaserv-account.log"
+#define DEFAULT_STATS_FILE        "manaserv.stats"
+#define DEFAULT_CONFIG_FILE       "manaserv.xml"
+#define DEFAULT_ATTRIBUTEDB_FILE  "attributes.xml"
 
 static bool running = true;        /**< Determines if server keeps running */
 
@@ -339,7 +340,8 @@ int main(int argc, char *argv[])
     initialize();
 
     std::string host = Configuration::getValue("net_listenHost", std::string());
-    if (!AccountClientHandler::initialize(options.port, host) ||
+    if (!AccountClientHandler::initialize(DEFAULT_ATTRIBUTEDB_FILE,
+                                          options.port, host) ||
         !GameServerHandler::initialize(options.port + 1, host) ||
         !chatHandler->startListen(options.port + 2, host))
     {