Added options to disable the server log to standard output to the minimum.

Also made some small cleanups.

Resolves: Mana-Mantis #241

Reviewed-by: Jaxad0127.

1 files changed, 13 insertions, 10 deletions

diff --git a/src/account-server/main-account.cpp b/src/account-server/main-account.cpp
index 0be05abe..23332362 100644
--- a/src/account-server/main-account.cpp
+++ b/src/account-server/main-account.cpp
@@ -148,9 +148,10 @@ static void initialize()
     // Initialize the logger.
     Logger::setLogFile(logFile);
 
-    // write the messages to both the screen and the log file.
-    Logger::setTeeMode(true);
-
+    // Write the messages to both the screen and the log file.
+    Logger::setTeeMode(
+                      Configuration::getBoolValue("log_accountToStandardOutput",
+                                                  true));
     LOG_INFO("Using log file: " << logFile);
 
     // Indicate in which file the statistics are put.
@@ -336,16 +337,21 @@ static void parseOptions(int argc, char *argv[], CommandLineOptions &options)
  */
 int main(int argc, char *argv[])
 {
-#ifdef PACKAGE_VERSION
-    LOG_INFO("The Mana Account+Chat Server v" << PACKAGE_VERSION);
-#endif
-
     // Parse command line options
     CommandLineOptions options;
     parseOptions(argc, argv, options);
 
     initializeConfiguration(options.configPath);
 
+    // General initialization
+    initialize();
+
+#ifdef PACKAGE_VERSION
+    LOG_INFO("The Mana Account+Chat Server v" << PACKAGE_VERSION);
+#else
+    LOG_INFO("The Mana Account+Chat Server (unknown version)");
+#endif
+
     if (!options.verbosityChanged)
         options.verbosity = static_cast<Logger::Level>(
                             Configuration::getValue("log_accountServerLogLevel",
@@ -356,9 +362,6 @@ int main(int argc, char *argv[])
         options.port = Configuration::getValue("net_accountServerPort",
                                                options.port);
 
-    // General initialization
-    initialize();
-
     std::string host = Configuration::getValue("net_listenHost", std::string());
     if (!AccountClientHandler::initialize(DEFAULT_ATTRIBUTEDB_FILE,
                                           options.port, host) ||