summaryrefslogtreecommitdiffstats
path: root/src/Server/RequestHandlers/DaemonRequestHandlerGroup.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/Server/RequestHandlers/DaemonRequestHandlerGroup.cpp')
-rw-r--r--src/Server/RequestHandlers/DaemonRequestHandlerGroup.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Server/RequestHandlers/DaemonRequestHandlerGroup.cpp b/src/Server/RequestHandlers/DaemonRequestHandlerGroup.cpp
index 4ff8c40..0e21fdd 100644
--- a/src/Server/RequestHandlers/DaemonRequestHandlerGroup.cpp
+++ b/src/Server/RequestHandlers/DaemonRequestHandlerGroup.cpp
@@ -21,7 +21,7 @@
#include "../ConnectionManager.h"
#include "../Requests/CommandRequest.h"
-#include <Common/Logger.h>
+#include <Core/Logger.h>
#include <Common/Requests/FSInfoRequest.h>
#include <Common/Requests/StatusRequest.h>
@@ -31,11 +31,11 @@ namespace RequestHandlers {
void DaemonRequestHandlerGroup::DaemonRequestHandler::handlePacket(boost::shared_ptr<const Common::XmlPacket> packet) {
if(packet->getType() != type) {
- Common::Logger::log(Common::Logger::ERROR, "Received an unexpected packet.");
+ Core::Logger::log(Core::Logger::ERROR, "Received an unexpected packet.");
Common::XmlPacket ret;
ret.setType("Error");
- ret.add("ErrorCode", Net::Exception::UNEXPECTED_PACKET);
+ ret.add("ErrorCode", Core::Exception::UNEXPECTED_PACKET);
sendPacket(ret);
@@ -59,7 +59,7 @@ void DaemonRequestHandlerGroup::DaemonRequestHandler::handlePacket(boost::shared
request->connectSignalFinished(boost::bind(&DaemonRequestHandlerGroup::DaemonRequestHandler::requestFinished, this, _1, _2));
Common::RequestManager::get()->sendRequest(daemonCon.get(), request);
}
- catch(Net::Exception &e) {
+ catch(Core::Exception &e) {
Common::XmlPacket ret;
ret.setType("Error");
ret.add("ErrorCode", e.getErrorCode());
@@ -72,7 +72,7 @@ void DaemonRequestHandlerGroup::DaemonRequestHandler::handlePacket(boost::shared
}
}
-void DaemonRequestHandlerGroup::DaemonRequestHandler::requestFinished(boost::shared_ptr<const Common::XmlPacket> packet, Net::Exception error) {
+void DaemonRequestHandlerGroup::DaemonRequestHandler::requestFinished(boost::shared_ptr<const Common::XmlPacket> packet, Core::Exception error) {
if(error) {
Common::XmlPacket ret;
ret.setType("Error");