diff options
Diffstat (limited to 'src/Client/SystemCommands.cpp')
-rw-r--r-- | src/Client/SystemCommands.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/Client/SystemCommands.cpp b/src/Client/SystemCommands.cpp index 5409828..490f278 100644 --- a/src/Client/SystemCommands.cpp +++ b/src/Client/SystemCommands.cpp @@ -20,7 +20,7 @@ #include "SystemCommands.h" #include "CommandParser.h" -#include <Common/Logger.h> +#include <Core/Logger.h> #include <Common/RequestManager.h> #include "Requests/DaemonFSInfoRequest.h" @@ -146,7 +146,7 @@ void SystemCommands::fsinfoCommand(const std::vector<std::string> &args, Common: else if(args.size() == 2) request = boost::shared_ptr<Requests::DaemonFSInfoRequest>(new Requests::DaemonFSInfoRequest(args[1])); else { - Common::Logger::logf(Common::Logger::ERROR, "%s: Too many arguments.", args[0].c_str()); + Core::Logger::logf(Core::Logger::ERROR, "%s: Too many arguments.", args[0].c_str()); CommandParser::printUsage("fsinfo"); return; } @@ -154,10 +154,10 @@ void SystemCommands::fsinfoCommand(const std::vector<std::string> &args, Common: Common::RequestManager::get()->sendRequest(connection, request); request->wait(); - std::pair<boost::shared_ptr<const Common::XmlPacket>, Net::Exception> result = request->getResult(); + std::pair<boost::shared_ptr<const Common::XmlPacket>, Core::Exception> result = request->getResult(); if(!result.first || result.second) { - Common::Logger::logf(Common::Logger::ERROR, "An error occurred during your request: %s.", result.second.strerror().c_str()); + Core::Logger::logf(Core::Logger::ERROR, "An error occurred during your request: %s.", result.second.strerror().c_str()); } else { if(args.size() == 1) @@ -171,7 +171,7 @@ void SystemCommands::fsinfoCommand(const std::vector<std::string> &args, Common: void SystemCommands::rebootCommand(const std::vector<std::string> &args, Common::Connection *connection) { if(args.size() < 2) { - Common::Logger::logf(Common::Logger::ERROR, "%s: No host given.", args[0].c_str()); + Core::Logger::logf(Core::Logger::ERROR, "%s: No host given.", args[0].c_str()); CommandParser::printUsage("reboot"); return; } @@ -191,16 +191,16 @@ void SystemCommands::rebootCommand(const std::vector<std::string> &args, Common: (*request)->wait(); for(std::vector<boost::shared_ptr<Requests::DaemonCommandRequest> >::iterator request = requests.begin(); request != requests.end(); ++request) { - std::pair<boost::shared_ptr<const Common::XmlPacket>, Net::Exception> result = (*request)->getResult(); + std::pair<boost::shared_ptr<const Common::XmlPacket>, Core::Exception> result = (*request)->getResult(); if(result.second) - Common::Logger::logf(Common::Logger::ERROR, "An error occurred during your request: %s.", result.second.strerror().c_str()); + Core::Logger::logf(Core::Logger::ERROR, "An error occurred during your request: %s.", result.second.strerror().c_str()); } } void SystemCommands::shutdownCommand(const std::vector<std::string> &args, Common::Connection *connection) { if(args.size() < 2) { - Common::Logger::logf(Common::Logger::ERROR, "%s: No host given.", args[0].c_str()); + Core::Logger::logf(Core::Logger::ERROR, "%s: No host given.", args[0].c_str()); CommandParser::printUsage("shutdown"); return; } @@ -220,10 +220,10 @@ void SystemCommands::shutdownCommand(const std::vector<std::string> &args, Commo (*request)->wait(); for(std::vector<boost::shared_ptr<Requests::DaemonCommandRequest> >::iterator request = requests.begin(); request != requests.end(); ++request) { - std::pair<boost::shared_ptr<const Common::XmlPacket>, Net::Exception> result = (*request)->getResult(); + std::pair<boost::shared_ptr<const Common::XmlPacket>, Core::Exception> result = (*request)->getResult(); if(result.second) - Common::Logger::logf(Common::Logger::ERROR, "An error occurred during your request: %s.", result.second.strerror().c_str()); + Core::Logger::logf(Core::Logger::ERROR, "An error occurred during your request: %s.", result.second.strerror().c_str()); } } @@ -235,7 +235,7 @@ void SystemCommands::statusCommand(const std::vector<std::string> &args, Common: else if(args.size() == 2) request = boost::shared_ptr<Requests::DaemonStatusRequest>(new Requests::DaemonStatusRequest(args[1])); else { - Common::Logger::logf(Common::Logger::ERROR, "%s: Too many arguments.", args[0].c_str()); + Core::Logger::logf(Core::Logger::ERROR, "%s: Too many arguments.", args[0].c_str()); CommandParser::printUsage("status"); return; } @@ -243,10 +243,10 @@ void SystemCommands::statusCommand(const std::vector<std::string> &args, Common: Common::RequestManager::get()->sendRequest(connection, request); request->wait(); - std::pair<boost::shared_ptr<const Common::XmlPacket>, Net::Exception> result = request->getResult(); + std::pair<boost::shared_ptr<const Common::XmlPacket>, Core::Exception> result = request->getResult(); if(!result.first || result.second) { - Common::Logger::logf(Common::Logger::ERROR, "An error occurred during your request: %s.", result.second.strerror().c_str()); + Core::Logger::logf(Core::Logger::ERROR, "An error occurred during your request: %s.", result.second.strerror().c_str()); } else { if(args.size() == 1) |