summaryrefslogtreecommitdiffstats
path: root/src/mad.cpp
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2008-10-25 15:50:08 +0200
committerMatthias Schiffer <matthias@gamezock.de>2008-10-25 15:50:08 +0200
commitb58831e5eec4d0595099b8e9c2979b157fe37041 (patch)
treef646c491f607ba8f959e02fae69d455ecce5e232 /src/mad.cpp
parent63ce9414183fb094a4bc172750d46810c332e786 (diff)
downloadmad-b58831e5eec4d0595099b8e9c2979b157fe37041.tar
mad-b58831e5eec4d0595099b8e9c2979b157fe37041.zip
ConsoleLogger kann jetzt ?ber Konfigurationsdateien aktiviert werden
Diffstat (limited to 'src/mad.cpp')
-rw-r--r--src/mad.cpp12
1 files changed, 5 insertions, 7 deletions
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<Common::RequestHandlers::FSInfoRequestHandler>(Net::Packet::FS_INFO);
Common::RequestManager::getRequestManager()->registerPacketType<Common::RequestHandlers::StatusRequestHandler>(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) {