From 2b83ae7c71dc706fb4fd7b4efc4a8ffee8dfe522 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Mon, 27 Oct 2008 22:41:06 +0100
Subject: Neues Initialisierung-Framework hinzugef?gt

---
 src/mad.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/mad.cpp')

diff --git a/src/mad.cpp b/src/mad.cpp
index 36432e1..d2315f1 100644
--- a/src/mad.cpp
+++ b/src/mad.cpp
@@ -23,6 +23,7 @@
 #include "Common/Backends/SystemBackendPosix.h"
 #include "Common/Backends/SystemBackendProc.h"
 #include "Common/ConfigManager.h"
+#include "Common/LogManager.h"
 #include "Common/Logger.h"
 #include "Common/Request.h"
 #include "Common/RequestManager.h"
@@ -44,10 +45,9 @@ static void requestFinished(const Common::Request<>&) {
 int main() {
   Net::Connection::init();
 
-  Common::Logger::initConfigHelper();
   Common::ConfigManager::getConfigManager()->finish();
 
-  Common::RequestManager::init(false);
+  Common::RequestManager::getRequestManager()->init();
   Common::RequestManager::getRequestManager()->registerPacketType<Common::RequestHandlers::FSInfoRequestHandler>(Net::Packet::FS_INFO);
   Common::RequestManager::getRequestManager()->registerPacketType<Common::RequestHandlers::StatusRequestHandler>(Net::Packet::STATUS);
   Common::RequestManager::getRequestManager()->registerPacketType<Daemon::RequestHandlers::CommandRequestHandler>(Net::Packet::COMMAND_REBOOT);
@@ -66,8 +66,8 @@ int main() {
 
     Common::RequestManager::getRequestManager()->registerConnection(connection);
 
-    Daemon::Backends::NetworkLogger networkLogger(connection);
-    //TODO Common::Logger::registerLogger(&networkLogger);
+    Common::SharedPtr<Common::Logger> networkLogger = new Daemon::Backends::NetworkLogger(connection);
+    Common::LogManager::getLogManager()->registerLogger(networkLogger);
 
 
     //char hostname[256];
@@ -78,6 +78,8 @@ int main() {
     while(connection->isConnected())
       Net::FdManager::getFdManager()->run();
 
+    Common::LogManager::getLogManager()->unregisterLogger(networkLogger);
+
     Common::RequestManager::getRequestManager()->unregisterConnection(connection);
   }
   catch(Mad::Common::Exception &e) {
@@ -86,6 +88,8 @@ int main() {
 
   delete connection;
 
+  Common::Initializable::deinit();
+
   Net::Connection::deinit();
 
   return 0;
-- 
cgit v1.2.3