Request- und RequestHandler-Interfaces vereinfacht

1 files changed, 4 insertions, 6 deletions

diff --git a/src/Core/RequestHandlers/LogRequestHandler.cpp b/src/Core/RequestHandlers/LogRequestHandler.cpp
index 77be876..aeec7da 100644
--- a/src/Core/RequestHandlers/LogRequestHandler.cpp
+++ b/src/Core/RequestHandlers/LogRequestHandler.cpp
@@ -20,15 +20,13 @@
 #include "LogRequestHandler.h"
 #include <Common/Logger.h>
 #include <Common/LogManager.h>
-#include <Common/XmlPacket.h>
 #include "../ConnectionManager.h"
-#include <Net/Connection.h>
 
 namespace Mad {
 namespace Core {
 namespace RequestHandlers {
 
-void LogRequestHandler::handlePacket(Net::Connection *connection, uint16_t requestId, const Common::XmlPacket &packet) {
+void LogRequestHandler::handlePacket(const Common::XmlPacket &packet) {
   if(packet.getType() != "Log") {
     Common::Logger::log(Common::Logger::ERROR, "Received an unexpected packet.");
 
@@ -36,7 +34,7 @@ void LogRequestHandler::handlePacket(Net::Connection *connection, uint16_t reque
     ret.setType("Error");
     ret.add("ErrorCode", Common::Exception::UNEXPECTED_PACKET);
 
-    connection->send(ret.encode(requestId));
+    sendPacket(ret);
 
     signalFinished().emit();
     return;
@@ -46,7 +44,7 @@ void LogRequestHandler::handlePacket(Net::Connection *connection, uint16_t reque
 
   try {
     Common::LogManager::get()->log(packet["category"], packet["level"], packet["timestamp"], packet["message"],
-        ConnectionManager::get()->getDaemonName(connection));
+        ConnectionManager::get()->getDaemonName(getConnection()));
   }
   catch(Common::Exception &e) {
     Common::Logger::logf(Common::Logger::ERROR, "Can't determine daemon name: %s", e.strerror().c_str());
@@ -55,7 +53,7 @@ void LogRequestHandler::handlePacket(Net::Connection *connection, uint16_t reque
   Common::XmlPacket ret;
   ret.setType("OK");
 
-  connection->send(ret.encode(requestId));
+  sendPacket(ret);
 
   signalFinished().emit();
 }