From a7a285eb61dd83afc892bc1d64ffe14b9f1426a3 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 27 Sep 2009 23:51:34 +0200 Subject: Completely migrate to Unicode String class --- src/Daemon/Backends/NetworkLogger.h | 4 ++-- src/Daemon/Requests/LogRequest.cpp | 2 +- src/Daemon/Requests/LogRequest.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/Daemon') diff --git a/src/Daemon/Backends/NetworkLogger.h b/src/Daemon/Backends/NetworkLogger.h index 2ee9fcf..dc285a3 100644 --- a/src/Daemon/Backends/NetworkLogger.h +++ b/src/Daemon/Backends/NetworkLogger.h @@ -35,8 +35,8 @@ class NetworkLogger : public Core::Logger { Common::Connection *connection; protected: - virtual void logMessage(Core::Logger::MessageCategory category, Core::Logger::MessageLevel level, boost::posix_time::ptime messageTimestamp, const std::string &message, const std::string &source) { - boost::shared_ptr request(new Requests::LogRequest(application, category, level, messageTimestamp, message.c_str(), source.c_str())); + virtual void logMessage(Core::Logger::MessageCategory category, Core::Logger::MessageLevel level, boost::posix_time::ptime messageTimestamp, const Core::String &message, const Core::String &source) { + boost::shared_ptr request(new Requests::LogRequest(application, category, level, messageTimestamp, message, source)); application->getRequestManager()->sendRequest(connection, request); } diff --git a/src/Daemon/Requests/LogRequest.cpp b/src/Daemon/Requests/LogRequest.cpp index 1f1fdc8..8a24d26 100644 --- a/src/Daemon/Requests/LogRequest.cpp +++ b/src/Daemon/Requests/LogRequest.cpp @@ -32,7 +32,7 @@ void LogRequest::sendRequest() { packet.set("category", category); packet.set("level", level); - packet.set("timestamp", boost::posix_time::to_iso_string(messageTimestamp).c_str()); + packet.set("timestamp", timestamp); packet.set("message", message); packet.set("source", source); diff --git a/src/Daemon/Requests/LogRequest.h b/src/Daemon/Requests/LogRequest.h index 8630b45..68f8cc0 100644 --- a/src/Daemon/Requests/LogRequest.h +++ b/src/Daemon/Requests/LogRequest.h @@ -33,16 +33,16 @@ class MAD_DAEMON_EXPORT LogRequest : public Common::Request { private: Core::Logger::MessageCategory category; Core::Logger::MessageLevel level; - boost::posix_time::ptime messageTimestamp; + boost::posix_time::ptime timestamp; Core::String message, source; protected: virtual void sendRequest(); public: - LogRequest(Common::Application *application, Core::Logger::MessageCategory category0, Core::Logger::MessageLevel level0, boost::posix_time::ptime messageTimestamp0, const Core::String &message0, + LogRequest(Common::Application *application, Core::Logger::MessageCategory category0, Core::Logger::MessageLevel level0, boost::posix_time::ptime timestamp0, const Core::String &message0, const Core::String &source0) - : Common::Request(application), category(category0), level(level0), messageTimestamp(messageTimestamp0), message(message0), source(source0) {} + : Common::Request(application), category(category0), level(level0), timestamp(timestamp0), message(message0), source(source0) {} }; } -- cgit v1.2.3