summaryrefslogtreecommitdiff
path: root/src/components/hmi_message_handler/src/messagebroker_adapter.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/hmi_message_handler/src/messagebroker_adapter.cc')
-rw-r--r--src/components/hmi_message_handler/src/messagebroker_adapter.cc28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/components/hmi_message_handler/src/messagebroker_adapter.cc b/src/components/hmi_message_handler/src/messagebroker_adapter.cc
index 13e6dfeca1..ca3d03dd91 100644
--- a/src/components/hmi_message_handler/src/messagebroker_adapter.cc
+++ b/src/components/hmi_message_handler/src/messagebroker_adapter.cc
@@ -38,7 +38,7 @@
namespace hmi_message_handler {
-CREATE_LOGGERPTR_GLOBAL(logger_, "HMIMessageHandler")
+SDL_CREATE_LOG_VARIABLE("HMIMessageHandler")
typedef hmi_message_handler::CMessageBrokerController MessageBrokerController;
@@ -47,17 +47,17 @@ MessageBrokerAdapter::MessageBrokerAdapter(HMIMessageHandler* handler_param,
uint16_t port)
: HMIMessageAdapterImpl(handler_param)
, MessageBrokerController(server_address, port, "SDL", 8) {
- LOG4CXX_TRACE(logger_, "Created MessageBrokerAdapter");
+ SDL_LOG_TRACE("Created MessageBrokerAdapter");
}
MessageBrokerAdapter::~MessageBrokerAdapter() {}
void MessageBrokerAdapter::SendMessageToHMI(
hmi_message_handler::MessageSharedPointer message) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
if (message.use_count() == 0) {
- LOG4CXX_ERROR(logger_, "Can`t send not valid message");
+ SDL_LOG_ERROR("Can`t send not valid message");
return;
}
@@ -66,7 +66,7 @@ void MessageBrokerAdapter::SendMessageToHMI(
const std::string str = message->json_message();
if (!reader.parse(str, &json_value)) {
- LOG4CXX_ERROR(logger_, "Received invalid json string. ");
+ SDL_LOG_ERROR("Received invalid json string. ");
return;
}
@@ -75,22 +75,22 @@ void MessageBrokerAdapter::SendMessageToHMI(
void MessageBrokerAdapter::processResponse(std::string method,
Json::Value& root) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
ProcessRecievedFromMB(root);
}
void MessageBrokerAdapter::processRequest(Json::Value& root) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
ProcessRecievedFromMB(root);
}
void MessageBrokerAdapter::processNotification(Json::Value& root) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
ProcessRecievedFromMB(root);
}
void MessageBrokerAdapter::SubscribeTo() {
- LOG4CXX_INFO(logger_, "MessageBrokerAdapter::subscribeTo");
+ SDL_LOG_INFO("MessageBrokerAdapter::subscribeTo");
MessageBrokerController::subscribeTo("Buttons.OnButtonEvent");
MessageBrokerController::subscribeTo("Buttons.OnButtonPress");
MessageBrokerController::subscribeTo("UI.OnCommand");
@@ -146,7 +146,7 @@ void MessageBrokerAdapter::SubscribeTo() {
MessageBrokerController::subscribeTo("UI.OnUpdateFile");
MessageBrokerController::subscribeTo("UI.OnUpdateSubMenu");
- LOG4CXX_INFO(logger_, "Subscribed to notifications.");
+ SDL_LOG_INFO("Subscribed to notifications.");
}
void* MessageBrokerAdapter::SubscribeAndBeginReceiverThread(void* param) {
@@ -159,8 +159,8 @@ void* MessageBrokerAdapter::SubscribeAndBeginReceiverThread(void* param) {
}
void MessageBrokerAdapter::ProcessRecievedFromMB(Json::Value& root) {
- LOG4CXX_AUTO_TRACE(logger_);
- LOG4CXX_INFO(logger_, "MB_Adapter: " << root);
+ SDL_LOG_AUTO_TRACE();
+ SDL_LOG_INFO("MB_Adapter: " << root);
if (root.isNull()) {
// LOG
return;
@@ -186,12 +186,12 @@ void MessageBrokerAdapter::ProcessRecievedFromMB(Json::Value& root) {
protocol_handler::MajorProtocolVersion::PROTOCOL_VERSION_HMI);
if (!handler()) {
- LOG4CXX_WARN(logger_, "handler is NULL");
+ SDL_LOG_WARN("handler is NULL");
return;
}
handler()->OnMessageReceived(message);
- LOG4CXX_INFO(logger_, "Successfully sent to observer");
+ SDL_LOG_INFO("Successfully sent to observer");
}
} // namespace hmi_message_handler