1 files changed, 39 insertions, 48 deletions

diff --git a/src/components/application_manager/src/help_prompt_manager_impl.cc b/src/components/application_manager/src/help_prompt_manager_impl.cc
index ec883e5fc2..8d43ff2d9f 100644
--- a/src/components/application_manager/src/help_prompt_manager_impl.cc
+++ b/src/components/application_manager/src/help_prompt_manager_impl.cc
@@ -43,7 +43,7 @@
 #include "smart_objects/smart_object.h"
 #include "utils/logger.h"
 
-CREATE_LOGGERPTR_GLOBAL(logger_, "HelpPromptManagerImpl")
+SDL_CREATE_LOG_VARIABLE("HelpPromptManagerImpl")
 
 namespace {
 const size_t kLimitCommand = 30;
@@ -60,19 +60,19 @@ HelpPromptManagerImpl::HelpPromptManagerImpl(Application& app,
     , is_ui_send_(false) {}
 
 HelpPromptManagerImpl::~HelpPromptManagerImpl() {
-  LOG4CXX_AUTO_TRACE(logger_);
+  SDL_LOG_AUTO_TRACE();
 }
 
 bool HelpPromptManagerImpl::AddCommand(
     const uint32_t cmd_id, const smart_objects::SmartObject& command) {
   if (!command.keyExists(strings::vr_commands)) {
-    LOG4CXX_DEBUG(logger_, "vr_commands does`t present");
+    SDL_LOG_DEBUG("vr_commands does`t present");
     return false;
   }
 
   const smart_objects::SmartObject& commands = command[strings::vr_commands];
   if (commands.empty()) {
-    LOG4CXX_DEBUG(logger_, "vr_commands array is empty");
+    SDL_LOG_DEBUG("vr_commands array is empty");
     return false;
   }
 
@@ -83,23 +83,21 @@ bool HelpPromptManagerImpl::AddCommand(
       [cmd_id](const VRCommandPair& pair) { return pair.first == cmd_id; });
 
   if (vr_commands_.end() != it) {
-    LOG4CXX_DEBUG(logger_, "Command with id:" << cmd_id << " already exists");
+    SDL_LOG_DEBUG("Command with id:" << cmd_id << " already exists");
     return false;
   }
 
   const bool limit_exceeded =
       kLimitCommand <= GetCommandsCount(vr_commands_.end());
 
-  LOG4CXX_DEBUG(
-      logger_,
-      "Will be added first command from array " << strings::vr_commands);
+  SDL_LOG_DEBUG("Will be added first command from array "
+                << strings::vr_commands);
 
   smart_objects::SmartObjectSPtr vr_item =
       std::make_shared<smart_objects::SmartObject>(commands.asArray()->front());
   vr_commands_.push_back(std::make_pair(cmd_id, vr_item));
 
-  LOG4CXX_DEBUG(logger_,
-                "VR command with id: " << cmd_id << " added for appID: "
+  SDL_LOG_DEBUG("VR command with id: " << cmd_id << " added for appID: "
                                        << app_.app_id() << ". Total "
                                        << vr_commands_.size() << " in cache");
 
@@ -107,7 +105,7 @@ bool HelpPromptManagerImpl::AddCommand(
 }
 
 bool HelpPromptManagerImpl::DeleteCommand(const uint32_t cmd_id) {
-  LOG4CXX_AUTO_TRACE(logger_);
+  SDL_LOG_AUTO_TRACE();
 
   sync_primitives::AutoLock lock(vr_commands_lock_);
 
@@ -117,17 +115,16 @@ bool HelpPromptManagerImpl::DeleteCommand(const uint32_t cmd_id) {
       [cmd_id](const VRCommandPair& pair) { return pair.first == cmd_id; });
 
   if (vr_commands_.end() == it) {
-    LOG4CXX_WARN(logger_, "VR command with id: " << cmd_id << " not found");
+    SDL_LOG_WARN("VR command with id: " << cmd_id << " not found");
     return false;
   }
 
   const size_t commands_before_current = GetCommandsCount(it);
   vr_commands_.erase(it);
-  LOG4CXX_DEBUG(logger_,
-                "VR command with id: "
-                    << cmd_id << " found after " << commands_before_current
-                    << " commands was deleted for appID: " << app_.app_id()
-                    << " Cache size after deleting: " << vr_commands_.size());
+  SDL_LOG_DEBUG("VR command with id: "
+                << cmd_id << " found after " << commands_before_current
+                << " commands was deleted for appID: " << app_.app_id()
+                << " Cache size after deleting: " << vr_commands_.size());
 
   return commands_before_current < kLimitCommand;
 }
@@ -136,12 +133,10 @@ void HelpPromptManagerImpl::OnVrCommandAdded(
     const uint32_t cmd_id,
     const smart_objects::SmartObject& command,
     const bool is_resumption) {
-  LOG4CXX_AUTO_TRACE(logger_);
+  SDL_LOG_AUTO_TRACE();
   if (SendingType::kNoneSend == sending_type_) {
-    LOG4CXX_DEBUG(logger_,
-                  "SendingType::kNoneSend"
-                      << " commands with id:" << cmd_id
-                      << " will not be added");
+    SDL_LOG_DEBUG("SendingType::kNoneSend"
+                  << " commands with id:" << cmd_id << " will not be added");
     return;
   }
   if (AddCommand(cmd_id, command) && !is_resumption) {
@@ -151,12 +146,10 @@ void HelpPromptManagerImpl::OnVrCommandAdded(
 
 void HelpPromptManagerImpl::OnVrCommandDeleted(const uint32_t cmd_id,
                                                const bool is_resumption) {
-  LOG4CXX_AUTO_TRACE(logger_);
+  SDL_LOG_AUTO_TRACE();
   if (SendingType::kNoneSend == sending_type_) {
-    LOG4CXX_DEBUG(logger_,
-                  "SendingType::kNoneSend"
-                      << " commands with id:" << cmd_id
-                      << " will not be deleted");
+    SDL_LOG_DEBUG("SendingType::kNoneSend"
+                  << " commands with id:" << cmd_id << " will not be deleted");
     return;
   }
   if (DeleteCommand(cmd_id) && !is_resumption) {
@@ -166,11 +159,11 @@ void HelpPromptManagerImpl::OnVrCommandDeleted(const uint32_t cmd_id,
 
 void HelpPromptManagerImpl::OnSetGlobalPropertiesReceived(
     const smart_objects::SmartObject& msg, const bool is_response) {
-  LOG4CXX_AUTO_TRACE(logger_);
+  SDL_LOG_AUTO_TRACE();
   if (SendingType::kNoneSend == sending_type_) {
-    LOG4CXX_DEBUG(logger_,
-                  "SendingType::kNoneSend"
-                  " do not track SetGlobalProperties");
+    SDL_LOG_DEBUG(
+        "SendingType::kNoneSend"
+        " do not track SetGlobalProperties");
     return;
   }
 
@@ -182,8 +175,8 @@ void HelpPromptManagerImpl::OnSetGlobalPropertiesReceived(
       is_ui_send_ = true;
     }
 
-    LOG4CXX_DEBUG(logger_, "is_tts_send_:" << is_tts_send_);
-    LOG4CXX_DEBUG(logger_, "is_ui_send_:" << is_ui_send_);
+    SDL_LOG_DEBUG("is_tts_send_:" << is_tts_send_);
+    SDL_LOG_DEBUG("is_ui_send_:" << is_ui_send_);
     return;
   }
 
@@ -222,8 +215,8 @@ void HelpPromptManagerImpl::GenerateVrItems(
 }
 
 void HelpPromptManagerImpl::SendTTSRequest() {
-  LOG4CXX_AUTO_TRACE(logger_);
-  LOG4CXX_DEBUG(logger_, "TTS request for appID:" << app_.app_id());
+  SDL_LOG_AUTO_TRACE();
+  SDL_LOG_DEBUG("TTS request for appID:" << app_.app_id());
   smart_objects::SmartObjectSPtr tts_global_properties =
       std::make_shared<smart_objects::SmartObject>(
           smart_objects::SmartType_Map);
@@ -256,8 +249,8 @@ void HelpPromptManagerImpl::SendTTSRequest() {
 }
 
 void HelpPromptManagerImpl::SendUIRequest() {
-  LOG4CXX_AUTO_TRACE(logger_);
-  LOG4CXX_DEBUG(logger_, "UI request for appID:" << app_.app_id());
+  SDL_LOG_AUTO_TRACE();
+  SDL_LOG_DEBUG("UI request for appID:" << app_.app_id());
   smart_objects::SmartObjectSPtr ui_global_properties =
       std::make_shared<smart_objects::SmartObject>(
           smart_objects::SmartType_Map);
@@ -290,13 +283,13 @@ void HelpPromptManagerImpl::SendUIRequest() {
 }
 
 void HelpPromptManagerImpl::SendBothRequests() {
-  LOG4CXX_AUTO_TRACE(logger_);
+  SDL_LOG_AUTO_TRACE();
   SendTTSRequest();
   SendUIRequest();
 }
 
 void HelpPromptManagerImpl::SendRequests() {
-  LOG4CXX_AUTO_TRACE(logger_);
+  SDL_LOG_AUTO_TRACE();
 
   sync_primitives::AutoLock lock(vr_commands_lock_);
   switch (sending_type_) {
@@ -312,21 +305,20 @@ void HelpPromptManagerImpl::SendRequests() {
     case SendingType::kNoneSend:
       break;
   }
-  LOG4CXX_DEBUG(logger_,
-                "SendingType:" << static_cast<uint32_t>(sending_type_)
+  SDL_LOG_DEBUG("SendingType:" << static_cast<uint32_t>(sending_type_)
                                << " request not sending");
 }
 
 void HelpPromptManagerImpl::CreatePromptMsg(
     smart_objects::SmartObject& out_msg_params) {
-  LOG4CXX_AUTO_TRACE(logger_);
+  SDL_LOG_AUTO_TRACE();
   GenerateVrItems(out_msg_params, strings::help_prompt);
   app_.set_help_prompt(out_msg_params[strings::help_prompt]);
 }
 
 void HelpPromptManagerImpl::CreateVRMsg(
     smart_objects::SmartObject& out_msg_params) {
-  LOG4CXX_AUTO_TRACE(logger_);
+  SDL_LOG_AUTO_TRACE();
   if (false == out_msg_params.keyExists(strings::vr_help_title)) {
     if (app_.vr_help_title()) {
       out_msg_params[strings::vr_help_title] = (*app_.vr_help_title());
@@ -347,17 +339,17 @@ void HelpPromptManagerImpl::CreateVRMsg(
 
 void HelpPromptManagerImpl::SetSendingType(
     const smart_objects::SmartObject& msg) {
-  LOG4CXX_AUTO_TRACE(logger_);
+  SDL_LOG_AUTO_TRACE();
 
   hmi_apis::Common_Result::eType result =
       static_cast<hmi_apis::Common_Result::eType>(
           msg[strings::params][hmi_response::code].asInt());
-  LOG4CXX_DEBUG(logger_, "HMI response result:" << result);
+  SDL_LOG_DEBUG("HMI response result:" << result);
   if (hmi_apis::Common_Result::eType::SUCCESS == result) {
     hmi_apis::FunctionID::eType function_id =
         static_cast<hmi_apis::FunctionID::eType>(
             msg[strings::params][strings::function_id].asUInt());
-    LOG4CXX_DEBUG(logger_, "Function id:" << function_id);
+    SDL_LOG_DEBUG("Function id:" << function_id);
     switch (function_id) {
       case hmi_apis::FunctionID::TTS_SetGlobalProperties: {
         if (is_tts_send_) {
@@ -379,8 +371,7 @@ void HelpPromptManagerImpl::SetSendingType(
       }
       default: { break; }
     }
-    LOG4CXX_DEBUG(
-        logger_,
+    SDL_LOG_DEBUG(
         "Sending type set to:" << static_cast<uint32_t>(sending_type_));
   }
 }