Have one place where the Configuration is initialized

Also, removed the fallback to the standard config file path when a
config file path is specified on the command line. Surely that's not
what you would want to happen.

Reviewed-by: Yohann Ferreira

1 files changed, 12 insertions, 44 deletions

diff --git a/src/game-server/main-game.cpp b/src/game-server/main-game.cpp
index a9a6652a..e7a06c84 100644
--- a/src/game-server/main-game.cpp
+++ b/src/game-server/main-game.cpp
@@ -63,7 +63,6 @@ using utils::Logger;
 
 // Default options that automake should be able to override.
 #define DEFAULT_LOG_FILE                    "manaserv-game.log"
-#define DEFAULT_CONFIG_FILE                 "manaserv.xml"
 #define DEFAULT_ITEMSDB_FILE                "items.xml"
 #define DEFAULT_EQUIPDB_FILE                "equip.xml"
 #define DEFAULT_SKILLSDB_FILE               "skills.xml"
@@ -108,47 +107,6 @@ static void closeGracefully(int)
     running = false;
 }
 
-static void initializeConfiguration(std::string configPath = std::string())
-{
-    if (configPath.empty())
-        configPath = DEFAULT_CONFIG_FILE;
-
-    bool configFound = true;
-    if (!Configuration::initialize(configPath))
-    {
-        configFound = false;
-
-        // If the config file isn't the default and fail to load,
-        // we try the default one with a warning.
-        if (configPath.compare(DEFAULT_CONFIG_FILE))
-        {
-            LOG_WARN("Invalid config path: " << configPath
-                     << ". Trying default value: " << DEFAULT_CONFIG_FILE ".");
-            configPath = DEFAULT_CONFIG_FILE;
-            configFound = true;
-
-            if (!Configuration::initialize(configPath))
-                  configFound = false;
-        }
-
-        if (!configFound)
-        {
-            LOG_FATAL("Refusing to run without configuration!" << std::endl
-            << "Invalid config path: " << configPath << ".");
-            exit(EXIT_CONFIG_NOT_FOUND);
-        }
-    }
-
-    LOG_INFO("Using config file: " << configPath);
-
-    // Check inter-server password.
-    if (Configuration::getValue("net_password", std::string()).empty())
-    {
-        LOG_FATAL("SECURITY WARNING: 'net_password' not set!");
-        exit(EXIT_BAD_CONFIG_PARAMETER);
-    }
-}
-
 static void initializeServer()
 {
     // Used to close via process signals
@@ -266,7 +224,6 @@ static void printHelp()
 struct CommandLineOptions
 {
     CommandLineOptions():
-        configPath(DEFAULT_CONFIG_FILE),
         verbosity(Logger::Warn),
         verbosityChanged(false),
         port(DEFAULT_SERVER_PORT + 3),
@@ -339,7 +296,18 @@ int main(int argc, char *argv[])
     CommandLineOptions options;
     parseOptions(argc, argv, options);
 
-    initializeConfiguration(options.configPath);
+    if (!Configuration::initialize(options.configPath))
+    {
+        LOG_FATAL("Refusing to run without configuration!");
+        exit(EXIT_CONFIG_NOT_FOUND);
+    }
+
+    // Check inter-server password.
+    if (Configuration::getValue("net_password", std::string()).empty())
+    {
+        LOG_FATAL("SECURITY WARNING: 'net_password' not set!");
+        exit(EXIT_BAD_CONFIG_PARAMETER);
+    }
 
     if (!options.verbosityChanged)
         options.verbosity = static_cast<Logger::Level>(