Merge branch 'master' of github.com:mana/manaserv

Conflicts:
	src/game-server/accountconnection.cpp

1 files changed, 1 insertions, 18 deletions

diff --git a/src/account-server/main-account.cpp b/src/account-server/main-account.cpp
index 6d46ec4..0adf128 100644
--- a/src/account-server/main-account.cpp
+++ b/src/account-server/main-account.cpp
@@ -141,14 +141,7 @@ static void initialize()
     // Initialize PhysicsFS
     PHYSFS_init("");
 
-    // Initialize the logger.
-    Logger::setLogFile(logFile, 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);
+    Logger::initialize(logFile);
 
     // Indicate in which file the statistics are put.
     statisticsFile = Configuration::getValue("log_statisticsFile",
@@ -156,16 +149,6 @@ static void initialize()
 
     LOG_INFO("Using statistics file: " << statisticsFile);
 
-    // Set up the options related to log rotation.
-    Logger::enableLogRotation(Configuration::getBoolValue("log_enableRotation",
-                                                          false));
-
-    Logger::setMaxLogfileSize(Configuration::getValue("log_maxFileSize",
-                                                      1024));
-
-    Logger::setSwitchLogEachDay(Configuration::getBoolValue("log_perDay",
-                                                            false));
-
     ResourceManager::initialize();
 
     // Open database