diff options
Diffstat (limited to 'src/mad.cpp')
-rw-r--r-- | src/mad.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/mad.cpp b/src/mad.cpp index 42afc87..107f240 100644 --- a/src/mad.cpp +++ b/src/mad.cpp @@ -17,10 +17,9 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "Net/ThreadManager.h" -#include "Common/ConfigManager.h" -#include "Common/LogManager.h" -#include "Common/Logger.h" +#include "Core/ThreadManager.h" +#include "Core/ConfigManager.h" +#include "Core/LogManager.h" #include "Common/ModuleManager.h" #include "Common/RequestManager.h" #include "Common/ClientConnection.h" @@ -36,13 +35,13 @@ using namespace Mad; int main() { - Net::ThreadManager::get()->init(); + Core::ThreadManager::get()->init(); Common::ModuleManager::get()->loadModule("FileLogger"); Common::ModuleManager::get()->loadModule("SystemBackendPosix"); Common::ModuleManager::get()->loadModule("SystemBackendProc"); - Common::ConfigManager::get()->finish(); + Core::ConfigManager::get()->finish(); Common::RequestManager::get()->registerPacketType<Daemon::RequestHandlers::CommandRequestHandler>("Command"); Common::RequestManager::get()->registerPacketType<Common::RequestHandlers::FSInfoRequestHandler>("FSInfo"); @@ -58,8 +57,8 @@ int main() { Common::RequestManager::get()->registerConnection(connection); - Common::Logger *networkLogger = new Daemon::Backends::NetworkLogger(connection); - Common::LogManager::get()->registerLogger(networkLogger); + Core::Logger *networkLogger = new Daemon::Backends::NetworkLogger(connection); + Core::LogManager::get()->registerLogger(networkLogger); //char hostname[256]; @@ -71,16 +70,16 @@ int main() { Common::RequestManager::get()->sendRequest(connection, request); request->wait(); } - Common::Logger::log("Identified."); + Core::Logger::log("Identified."); connection->waitWhileConnected(); - Common::LogManager::get()->unregisterLogger(networkLogger); + Core::LogManager::get()->unregisterLogger(networkLogger); Common::RequestManager::get()->unregisterConnection(connection); } - catch(Net::Exception &e) { - Common::Logger::logf(Common::Logger::CRITICAL, "Connection error: %s", e.strerror().c_str()); + catch(Core::Exception &e) { + Core::Logger::logf(Core::Logger::CRITICAL, "Connection error: %s", e.strerror().c_str()); } delete connection; @@ -89,7 +88,7 @@ int main() { Common::RequestManager::get()->unregisterPacketType("FSInfo"); Common::RequestManager::get()->unregisterPacketType("GetStatus"); - Common::Initializable::deinit(); + Core::Initializable::deinit(); return 0; } |