summaryrefslogtreecommitdiffstats
path: root/src/mad.cpp
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2009-05-06 17:39:30 +0200
committerMatthias Schiffer <matthias@gamezock.de>2009-05-06 17:39:30 +0200
commit8324b947487f72fd8cfc439ea5ae5bd1187fff1b (patch)
treee7fb69f3207654b5e3d4ba260d3f51082b1d399a /src/mad.cpp
parent5bf3e2229015d93808bb0c2f4729c2c4f4da414e (diff)
downloadmad-8324b947487f72fd8cfc439ea5ae5bd1187fff1b.tar
mad-8324b947487f72fd8cfc439ea5ae5bd1187fff1b.zip
Exception und ThreadHandler nach Net verschoben
Diffstat (limited to 'src/mad.cpp')
-rw-r--r--src/mad.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mad.cpp b/src/mad.cpp
index c3d3a82..bc150e2 100644
--- a/src/mad.cpp
+++ b/src/mad.cpp
@@ -20,12 +20,12 @@
#include "Net/Connection.h"
#include "Net/FdManager.h"
#include "Net/IPAddress.h"
+#include "Net/ThreadManager.h"
#include "Common/ConfigManager.h"
#include "Common/LogManager.h"
#include "Common/Logger.h"
#include "Common/ModuleManager.h"
#include "Common/RequestManager.h"
-#include "Common/ThreadManager.h"
#include "Common/ClientConnection.h"
#include "Common/RequestHandlers/FSInfoRequestHandler.h"
#include "Common/RequestHandlers/StatusRequestHandler.h"
@@ -45,7 +45,7 @@ static void requestFinished(const Common::Request&) {
int main() {
Net::Connection::init();
- Common::ThreadManager::get()->init();
+ Net::ThreadManager::get()->init();
Common::ModuleManager::get()->loadModule("FileLogger");
Common::ModuleManager::get()->loadModule("SystemBackendPosix");
@@ -83,7 +83,7 @@ int main() {
Common::RequestManager::get()->unregisterConnection(connection);
}
- catch(Mad::Common::Exception &e) {
+ catch(Net::Exception &e) {
Common::Logger::logf(Common::Logger::CRITICAL, "Connection error: %s", e.strerror().c_str());
}