diff options
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc')
-rw-r--r-- | src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc index 71bf867054..d79cd57953 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc @@ -42,6 +42,8 @@ using namespace application_manager; namespace commands { +SDL_CREATE_LOG_VARIABLE("Commands") + AddSubMenuRequest::AddSubMenuRequest( const application_manager::commands::MessageSharedPtr& message, ApplicationManager& application_manager, @@ -57,12 +59,12 @@ AddSubMenuRequest::AddSubMenuRequest( AddSubMenuRequest::~AddSubMenuRequest() {} void AddSubMenuRequest::Run() { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); ApplicationSharedPtr app = application_manager_.application(connection_key()); if (!app) { - LOG4CXX_ERROR(logger_, "NULL pointer"); + SDL_LOG_ERROR("NULL pointer"); SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED); return; } @@ -77,8 +79,8 @@ void AddSubMenuRequest::Run() { received_msg_params[strings::menu_icon], app, application_manager_); if (mobile_apis::Result::INVALID_DATA == verification_result) { - LOG4CXX_ERROR( - logger_, "MessageHelper::VerifyImage return " << verification_result); + SDL_LOG_ERROR("MessageHelper::VerifyImage return " + << verification_result); SendResponse(false, verification_result); return; } @@ -86,7 +88,7 @@ void AddSubMenuRequest::Run() { const int32_t menu_id = received_msg_params[strings::menu_id].asInt(); if (app->FindSubMenu(menu_id)) { - LOG4CXX_ERROR(logger_, "Menu with id " << menu_id << " is not found."); + SDL_LOG_ERROR("Menu with id " << menu_id << " is not found."); SendResponse(false, mobile_apis::Result::INVALID_ID); return; } @@ -100,13 +102,13 @@ void AddSubMenuRequest::Run() { : 0; if (app->IsSubMenuNameAlreadyExist(menu_name, parent_id)) { - LOG4CXX_ERROR(logger_, "Menu name " << menu_name << " is duplicated."); + SDL_LOG_ERROR("Menu name " << menu_name << " is duplicated."); SendResponse(false, mobile_apis::Result::DUPLICATE_NAME); return; } if (!CheckSubMenuName()) { - LOG4CXX_ERROR(logger_, "Sub-menu name is not valid."); + SDL_LOG_ERROR("Sub-menu name is not valid."); SendResponse(false, mobile_apis::Result::INVALID_DATA); return; } @@ -146,7 +148,7 @@ void AddSubMenuRequest::Run() { } void AddSubMenuRequest::on_event(const event_engine::Event& event) { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { @@ -164,7 +166,7 @@ void AddSubMenuRequest::on_event(const event_engine::Event& event) { application_manager_.application(connection_key()); if (!application) { - LOG4CXX_ERROR(logger_, "NULL pointer"); + SDL_LOG_ERROR("NULL pointer"); return; } @@ -191,7 +193,7 @@ void AddSubMenuRequest::on_event(const event_engine::Event& event) { break; } default: { - LOG4CXX_ERROR(logger_, "Received unknown event" << event.id()); + SDL_LOG_ERROR("Received unknown event " << event.id()); return; } } @@ -203,12 +205,12 @@ bool AddSubMenuRequest::Init() { } bool AddSubMenuRequest::CheckSubMenuName() { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); const char* str = NULL; str = (*message_)[strings::msg_params][strings::menu_name].asCharArray(); if (!CheckSyntax(str)) { - LOG4CXX_INFO(logger_, "Invalid subMenu name."); + SDL_LOG_INFO("Invalid subMenu name."); return false; } return true; |