summaryrefslogtreecommitdiff
path: root/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc')
-rw-r--r--src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc29
1 files changed, 15 insertions, 14 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc
index dd7b426b40..15ced6d5a1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc
@@ -43,6 +43,8 @@ using namespace application_manager;
namespace commands {
+SDL_CREATE_LOG_VARIABLE("Commands")
+
SliderRequest::SliderRequest(
const application_manager::commands::MessageSharedPtr& message,
ApplicationManager& application_manager,
@@ -72,20 +74,20 @@ bool SliderRequest::Init() {
}
void SliderRequest::Run() {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
ApplicationSharedPtr application = application_manager_.application(
(*message_)[strings::params][strings::connection_key].asUInt());
if (!application) {
- LOG4CXX_ERROR(logger_, "Application is not registered");
+ SDL_LOG_ERROR("Application is not registered");
SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED);
return;
}
if ((*message_)[strings::msg_params][strings::num_ticks].asInt() <
(*message_)[strings::msg_params][strings::position].asInt()) {
- LOG4CXX_ERROR(logger_, "INVALID_DATA");
+ SDL_LOG_ERROR("INVALID_DATA");
SendResponse(false, mobile_apis::Result::INVALID_DATA);
return;
}
@@ -94,7 +96,7 @@ void SliderRequest::Run() {
if (1 < (*message_)[strings::msg_params][strings::slider_footer].length()) {
if ((*message_)[strings::msg_params][strings::num_ticks].asUInt() !=
(*message_)[strings::msg_params][strings::slider_footer].length()) {
- LOG4CXX_ERROR(logger_, "INVALID_DATA");
+ SDL_LOG_ERROR("INVALID_DATA");
SendResponse(false, mobile_apis::Result::INVALID_DATA);
return;
}
@@ -102,7 +104,7 @@ void SliderRequest::Run() {
}
if (IsWhiteSpaceExist()) {
- LOG4CXX_ERROR(logger_, "Incoming slider has contains \t\n \\t \\n");
+ SDL_LOG_ERROR("Incoming slider has contains \t\n \\t \\n");
SendResponse(false, mobile_apis::Result::INVALID_DATA);
return;
}
@@ -126,7 +128,7 @@ void SliderRequest::Run() {
}
void SliderRequest::on_event(const event_engine::Event& event) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
using namespace helpers;
using namespace smart_objects;
using namespace hmi_apis;
@@ -135,18 +137,18 @@ void SliderRequest::on_event(const event_engine::Event& event) {
const event_engine::Event::EventID event_id = event.id();
if (event_id == FunctionID::UI_OnResetTimeout) {
- LOG4CXX_INFO(logger_, "Received UI_OnResetTimeout event");
+ SDL_LOG_INFO("Received UI_OnResetTimeout event");
application_manager_.updateRequestTimeout(
connection_key(), correlation_id(), default_timeout());
return;
}
if (event_id != FunctionID::UI_Slider) {
- LOG4CXX_ERROR(logger_, "Received unknown event" << event.id());
+ SDL_LOG_ERROR("Received unknown event " << event.id());
return;
}
- LOG4CXX_DEBUG(logger_, "Received UI_Slider event");
+ SDL_LOG_DEBUG("Received UI_Slider event");
EndAwaitForInterface(HmiInterfaces::HMI_INTERFACE_UI);
const Common_Result::eType response_code = static_cast<Common_Result::eType>(
message[strings::params][hmi_response::code].asInt());
@@ -163,8 +165,7 @@ void SliderRequest::on_event(const event_engine::Event& event) {
response_msg_params[strings::slider_position] =
message[strings::params][strings::data][strings::slider_position];
} else {
- LOG4CXX_ERROR(logger_,
- strings::slider_position << " field is absent"
+ SDL_LOG_ERROR(strings::slider_position << " field is absent"
" in response.");
response_msg_params[strings::slider_position] = 0;
}
@@ -181,12 +182,12 @@ void SliderRequest::on_event(const event_engine::Event& event) {
}
bool SliderRequest::IsWhiteSpaceExist() {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
const char* str = NULL;
str = (*message_)[strings::msg_params][strings::slider_header].asCharArray();
if (!CheckSyntax(str)) {
- LOG4CXX_ERROR(logger_, "Invalid slider_header value syntax check failed");
+ SDL_LOG_ERROR("Invalid slider_header value syntax check failed");
return true;
}
@@ -200,7 +201,7 @@ bool SliderRequest::IsWhiteSpaceExist() {
for (; it_sf != it_sf_end; ++it_sf) {
str = (*it_sf).asCharArray();
if (!CheckSyntax(str)) {
- LOG4CXX_ERROR(logger_, "Invalid slider_footer syntax check failed");
+ SDL_LOG_ERROR("Invalid slider_footer syntax check failed");
return true;
}
}