From b58831e5eec4d0595099b8e9c2979b157fe37041 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 25 Oct 2008 15:50:08 +0200 Subject: ConsoleLogger kann jetzt ?ber Konfigurationsdateien aktiviert werden --- src/mad.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/mad.cpp') diff --git a/src/mad.cpp b/src/mad.cpp index 6ca18ae..36432e1 100644 --- a/src/mad.cpp +++ b/src/mad.cpp @@ -22,8 +22,8 @@ #include "Net/IPAddress.h" #include "Common/Backends/SystemBackendPosix.h" #include "Common/Backends/SystemBackendProc.h" +#include "Common/ConfigManager.h" #include "Common/Logger.h" -#include "Common/Backends/ConsoleLogger.h" #include "Common/Request.h" #include "Common/RequestManager.h" #include "Common/RequestHandlers/FSInfoRequestHandler.h" @@ -42,11 +42,11 @@ static void requestFinished(const Common::Request<>&) { } int main() { - Common::Backends::ConsoleLogger consoleLogger; - Common::Logger::registerLogger(&consoleLogger); - Net::Connection::init(); + Common::Logger::initConfigHelper(); + Common::ConfigManager::getConfigManager()->finish(); + Common::RequestManager::init(false); Common::RequestManager::getRequestManager()->registerPacketType(Net::Packet::FS_INFO); Common::RequestManager::getRequestManager()->registerPacketType(Net::Packet::STATUS); @@ -67,7 +67,7 @@ int main() { Common::RequestManager::getRequestManager()->registerConnection(connection); Daemon::Backends::NetworkLogger networkLogger(connection); - Common::Logger::registerLogger(&networkLogger); + //TODO Common::Logger::registerLogger(&networkLogger); //char hostname[256]; @@ -78,8 +78,6 @@ int main() { while(connection->isConnected()) Net::FdManager::getFdManager()->run(); - Common::Logger::unregisterLogger(&networkLogger); - Common::RequestManager::getRequestManager()->unregisterConnection(connection); } catch(Mad::Common::Exception &e) { -- cgit v1.2.3