summaryrefslogtreecommitdiff
path: root/src/components/application_manager/src/rpc_service_impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/application_manager/src/rpc_service_impl.cc')
-rw-r--r--src/components/application_manager/src/rpc_service_impl.cc134
1 files changed, 61 insertions, 73 deletions
diff --git a/src/components/application_manager/src/rpc_service_impl.cc b/src/components/application_manager/src/rpc_service_impl.cc
index c7959c2386..248db00729 100644
--- a/src/components/application_manager/src/rpc_service_impl.cc
+++ b/src/components/application_manager/src/rpc_service_impl.cc
@@ -41,7 +41,7 @@
namespace application_manager {
namespace rpc_service {
-CREATE_LOGGERPTR_LOCAL(logger_, "RPCServiceImpl")
+SDL_CREATE_LOG_VARIABLE("RPCServiceImpl")
namespace formatters = ns_smart_device_link::ns_json_handler::formatters;
namespace jhs = ns_smart_device_link::ns_json_handler::strings;
namespace plugin_names = application_manager::plugin_manager::plugin_names;
@@ -69,7 +69,7 @@ RPCServiceImpl::RPCServiceImpl(
RPCServiceImpl::~RPCServiceImpl() {}
void RPCServiceImpl::Stop() {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
messages_to_mobile_.Shutdown();
messages_to_hmi_.Shutdown();
@@ -79,7 +79,7 @@ EncryptionFlagCheckResult RPCServiceImpl::IsEncryptionRequired(
const smart_objects::SmartObject& message,
std::shared_ptr<Application> app,
const bool is_rpc_service_secure) const {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
const auto function_id =
message[strings::params][strings::function_id].asUInt();
const auto correlation_id =
@@ -122,15 +122,15 @@ bool RPCServiceImpl::ManageMobileCommand(
const commands::MessageSharedPtr message,
commands::Command::CommandSource source,
const std::string warning_info) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
if (!message) {
- LOG4CXX_WARN(logger_, "Null-pointer message received.");
+ SDL_LOG_WARN("Null-pointer message received.");
return false;
}
if (app_manager_.IsLowVoltage()) {
- LOG4CXX_WARN(logger_, "Low Voltage is active");
+ SDL_LOG_WARN("Low Voltage is active");
return false;
}
@@ -165,7 +165,7 @@ bool RPCServiceImpl::ManageMobileCommand(
(mobile_apis::FunctionID::UnregisterAppInterfaceID != function_id)) {
app = app_manager_.application(connection_key);
if (!app) {
- LOG4CXX_ERROR(logger_, "RET APPLICATION_NOT_REGISTERED");
+ SDL_LOG_ERROR("RET APPLICATION_NOT_REGISTERED");
smart_objects::SmartObjectSPtr response =
MessageHelper::CreateNegativeResponse(
connection_key,
@@ -197,7 +197,7 @@ bool RPCServiceImpl::ManageMobileCommand(
auto plugin =
app_manager_.GetPluginManager().FindPluginToProcess(function_id, source);
if (!plugin) {
- LOG4CXX_WARN(logger_, "Failed to find plugin : " << plugin.error());
+ SDL_LOG_WARN("Failed to find plugin : " << plugin.error());
CheckSourceForUnsupportedRequest(message, source);
return false;
}
@@ -205,7 +205,7 @@ bool RPCServiceImpl::ManageMobileCommand(
auto command = factory.CreateCommand(message, source);
if (!command) {
- LOG4CXX_WARN(logger_, "Failed to create mobile command from smart object");
+ SDL_LOG_WARN("Failed to create mobile command from smart object");
return false;
}
@@ -257,12 +257,11 @@ bool RPCServiceImpl::ManageMobileCommand(
request_ctrl_.addMobileRequest(command, app_hmi_level);
if (result == request_controller::RequestController::SUCCESS) {
- LOG4CXX_DEBUG(logger_, "Perform request");
+ SDL_LOG_DEBUG("Perform request");
} else if (result == request_controller::RequestController::
TOO_MANY_PENDING_REQUESTS) {
- LOG4CXX_ERROR(logger_,
- "RET Unable top perform request: "
- << "TOO_MANY_PENDING_REQUESTS");
+ SDL_LOG_ERROR("RET Unable top perform request: "
+ << "TOO_MANY_PENDING_REQUESTS");
smart_objects::SmartObjectSPtr response =
MessageHelper::CreateNegativeResponse(
@@ -280,9 +279,8 @@ bool RPCServiceImpl::ManageMobileCommand(
return false;
} else if (result ==
request_controller::RequestController::TOO_MANY_REQUESTS) {
- LOG4CXX_ERROR(logger_,
- "RET Unable to perform request: "
- << "TOO_MANY_REQUESTS");
+ SDL_LOG_ERROR("RET Unable to perform request: "
+ << "TOO_MANY_REQUESTS");
ManageMobileCommand(
MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile(
@@ -301,9 +299,8 @@ bool RPCServiceImpl::ManageMobileCommand(
return false;
} else if (result == request_controller::RequestController::
NONE_HMI_LEVEL_MANY_REQUESTS) {
- LOG4CXX_ERROR(logger_,
- "RET Unable to perform request: "
- << "REQUEST_WHILE_IN_NONE_HMI_LEVEL");
+ SDL_LOG_ERROR("RET Unable to perform request: "
+ << "REQUEST_WHILE_IN_NONE_HMI_LEVEL");
ManageMobileCommand(
MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile(
@@ -320,13 +317,13 @@ bool RPCServiceImpl::ManageMobileCommand(
connection_key, mobile_apis::Result::INVALID_ENUM, false);
return false;
} else {
- LOG4CXX_ERROR(logger_, "RET Unable to perform request: Unknown case");
+ SDL_LOG_ERROR("RET Unable to perform request: Unknown case");
return false;
}
return true;
}
- LOG4CXX_ERROR(logger_, "RET UNKNOWN MESSAGE TYPE " << message_type);
+ SDL_LOG_ERROR("RET UNKNOWN MESSAGE TYPE " << message_type);
return false;
}
@@ -338,15 +335,15 @@ bool RPCServiceImpl::ManageHMICommand(const commands::MessageSharedPtr message,
bool RPCServiceImpl::ManageHMICommand(const commands::MessageSharedPtr message,
commands::Command::CommandSource source,
const std::string warning_info) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
if (!message) {
- LOG4CXX_WARN(logger_, "Null-pointer message received.");
+ SDL_LOG_WARN("Null-pointer message received.");
return false;
}
if (app_manager_.IsLowVoltage()) {
- LOG4CXX_WARN(logger_, "Low Voltage is active");
+ SDL_LOG_WARN("Low Voltage is active");
return false;
}
@@ -356,7 +353,7 @@ bool RPCServiceImpl::ManageHMICommand(const commands::MessageSharedPtr message,
auto plugin =
app_manager_.GetPluginManager().FindPluginToProcess(function_id, source);
if (!plugin) {
- LOG4CXX_WARN(logger_, "Filed to find plugin : " << plugin.error());
+ SDL_LOG_WARN("Filed to find plugin : " << plugin.error());
return false;
}
@@ -364,7 +361,7 @@ bool RPCServiceImpl::ManageHMICommand(const commands::MessageSharedPtr message,
auto command = factory.CreateCommand(message, source);
if (!command) {
- LOG4CXX_WARN(logger_, "Failed to create command from smart object");
+ SDL_LOG_WARN("Failed to create command from smart object");
return false;
}
@@ -386,7 +383,7 @@ bool RPCServiceImpl::ManageHMICommand(const commands::MessageSharedPtr message,
(*(message.get()))[strings::params][strings::message_type].asInt();
if (kRequest == message_type) {
- LOG4CXX_DEBUG(logger_, "ManageHMICommand");
+ SDL_LOG_DEBUG("ManageHMICommand");
command->set_warning_info(warning_info);
request_ctrl_.addHMIRequest(command);
}
@@ -406,21 +403,20 @@ bool RPCServiceImpl::ManageHMICommand(const commands::MessageSharedPtr message,
}
void RPCServiceImpl::Handle(const impl::MessageToHmi message) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
if (!hmi_handler_) {
- LOG4CXX_ERROR(logger_, "Observer is not set for HMIMessageHandler");
+ SDL_LOG_ERROR("Observer is not set for HMIMessageHandler");
return;
}
hmi_handler_->SendMessageToHMI(message);
- LOG4CXX_INFO(logger_, "Message for HMI given away");
+ SDL_LOG_INFO("Message for HMI given away");
}
void RPCServiceImpl::Handle(const impl::MessageToMobile message) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
if (!protocol_handler_) {
- LOG4CXX_WARN(logger_,
- "Protocol Handler is not set; cannot send message to mobile.");
+ SDL_LOG_WARN("Protocol Handler is not set; cannot send message to mobile.");
return;
}
@@ -428,7 +424,7 @@ void RPCServiceImpl::Handle(const impl::MessageToMobile message) {
MobileMessageHandler::HandleOutgoingMessageProtocol(message));
if (!rawMessage) {
- LOG4CXX_ERROR(logger_, "Failed to create raw message.");
+ SDL_LOG_ERROR("Failed to create raw message.");
return;
}
@@ -458,9 +454,9 @@ void RPCServiceImpl::Handle(const impl::MessageToMobile message) {
correlation_id);
if (needs_encryption && !is_service_secure) {
- LOG4CXX_WARN(logger_,
- "Unable to send rpc that requires encryption without secure "
- "rpc service");
+ SDL_LOG_WARN(
+ "Unable to send rpc that requires encryption without secure "
+ "rpc service");
return;
};
@@ -468,7 +464,7 @@ void RPCServiceImpl::Handle(const impl::MessageToMobile message) {
rawMessage, needs_encryption, is_final);
rpc_protection_manager_->RemoveFromEncryptionNeededCache(app_id,
correlation_id);
- LOG4CXX_INFO(logger_, "Message for mobile given away");
+ SDL_LOG_INFO("Message for mobile given away");
if (close_session) {
app_manager_.connection_handler().CloseSession(message->connection_key(),
@@ -479,16 +475,16 @@ void RPCServiceImpl::Handle(const impl::MessageToMobile message) {
void RPCServiceImpl::SendMessageToMobile(
const application_manager::commands::MessageSharedPtr message,
bool final_message) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
if (!message) {
- LOG4CXX_ERROR(logger_, "Null-pointer message received.");
+ SDL_LOG_ERROR("Null-pointer message received.");
NOTREACHED();
return;
}
if (!protocol_handler_) {
- LOG4CXX_WARN(logger_, "No Protocol Handler set");
+ SDL_LOG_WARN("No Protocol Handler set");
return;
}
@@ -500,7 +496,7 @@ void RPCServiceImpl::SendMessageToMobile(
bool allow_unknown_parameters = false;
if (!app) {
- LOG4CXX_ERROR(logger_, "No application associated with connection key");
+ SDL_LOG_ERROR("No application associated with connection key");
if (is_result_code_exists &&
((*message)[strings::msg_params][strings::result_code] ==
ns_smart_device_link_rpc::V1::Result::UNSUPPORTED_VERSION)) {
@@ -532,9 +528,8 @@ void RPCServiceImpl::SendMessageToMobile(
if (IsAppServiceRPC(function_id,
commands::Command::CommandSource::SOURCE_SDL) ||
rpc_passing) {
- LOG4CXX_DEBUG(
- logger_,
- "Allowing unknown parameters for response function " << function_id);
+ SDL_LOG_DEBUG("Allowing unknown parameters for response function "
+ << function_id);
allow_unknown_parameters = true;
}
@@ -552,13 +547,12 @@ void RPCServiceImpl::SendMessageToMobile(
(*message)[strings::params][strings::function_id].asUInt());
mobile_so_factory().attachSchema(*message, false);
- LOG4CXX_DEBUG(
- logger_,
+ SDL_LOG_DEBUG(
"Attached schema to message, result if valid: " << message->isValid());
if (!ConvertSOtoMessage(
(*message), (*message_to_send), allow_unknown_parameters)) {
- LOG4CXX_WARN(logger_, "Can't send msg to Mobile: failed to create string");
+ SDL_LOG_WARN("Can't send msg to Mobile: failed to create string");
return;
}
@@ -582,7 +576,7 @@ void RPCServiceImpl::SendMessageToMobile(
for (; iter != iter_end; ++iter) {
if (true == iter->second.asBool()) {
- LOG4CXX_INFO(logger_, "Request's param: " << iter->first);
+ SDL_LOG_INFO("Request's param: " << iter->first);
params.insert(iter->first);
}
}
@@ -593,8 +587,7 @@ void RPCServiceImpl::SendMessageToMobile(
app_manager_.CheckPolicyPermissions(
app, window_id, string_functionID, params);
if (mobile_apis::Result::SUCCESS != check_result) {
- LOG4CXX_WARN(logger_,
- "Function \"" << string_functionID << "\" (#"
+ SDL_LOG_WARN("Function \"" << string_functionID << "\" (#"
<< api_function_id
<< ") not allowed by policy");
return;
@@ -612,8 +605,7 @@ void RPCServiceImpl::SendMessageToMobile(
}
if (message_to_send->binary_data()) {
- LOG4CXX_DEBUG(
- logger_,
+ SDL_LOG_DEBUG(
"Binary data size: " << message_to_send->binary_data()->size());
}
messages_to_mobile_.PostMessage(
@@ -622,15 +614,15 @@ void RPCServiceImpl::SendMessageToMobile(
void RPCServiceImpl::SendMessageToHMI(
const commands::MessageSharedPtr message) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
if (!message) {
- LOG4CXX_WARN(logger_, "Null-pointer message received.");
+ SDL_LOG_WARN("Null-pointer message received.");
NOTREACHED();
return;
}
if (!hmi_handler_) {
- LOG4CXX_WARN(logger_, "No HMI Handler set");
+ SDL_LOG_WARN("No HMI Handler set");
return;
}
@@ -639,28 +631,25 @@ void RPCServiceImpl::SendMessageToHMI(
std::shared_ptr<Message> message_to_send(
new Message(protocol_handler::MessagePriority::kDefault));
if (!message_to_send) {
- LOG4CXX_ERROR(logger_, "Null pointer");
+ SDL_LOG_ERROR("Null pointer");
return;
}
hmi_so_factory().attachSchema(*message, false);
- LOG4CXX_INFO(
- logger_,
+ SDL_LOG_INFO(
"Attached schema to message, result if valid: " << message->isValid());
if (IsAppServiceRPC((*message)[jhs::S_PARAMS][jhs::S_FUNCTION_ID].asInt(),
commands::Command::CommandSource::SOURCE_SDL_TO_HMI)) {
- LOG4CXX_DEBUG(logger_,
- "Allowing unknown parameters for response function "
- << (*message)[jhs::S_PARAMS][jhs::S_FUNCTION_ID].asInt());
+ SDL_LOG_DEBUG("Allowing unknown parameters for response function "
+ << (*message)[jhs::S_PARAMS][jhs::S_FUNCTION_ID].asInt());
allow_unknown_parameters = true;
}
if (!ConvertSOtoMessage(
*message, *message_to_send, allow_unknown_parameters)) {
- LOG4CXX_WARN(logger_,
- "Cannot send message to HMI: failed to create string");
+ SDL_LOG_WARN("Cannot send message to HMI: failed to create string");
return;
}
messages_to_hmi_.PostMessage(impl::MessageToHmi(message_to_send));
@@ -716,16 +705,15 @@ bool RPCServiceImpl::ConvertSOtoMessage(
const ns_smart_device_link::ns_smart_objects::SmartObject& message,
Message& output,
const bool allow_unknown_parameters) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
if (smart_objects::SmartType_Null == message.getType() ||
smart_objects::SmartType_Invalid == message.getType()) {
- LOG4CXX_WARN(logger_, "Invalid smart object received.");
+ SDL_LOG_WARN("Invalid smart object received.");
return false;
}
- LOG4CXX_DEBUG(
- logger_,
+ SDL_LOG_DEBUG(
"Message with protocol: " << message.getElement(jhs::S_PARAMS)
.getElement(jhs::S_PROTOCOL_TYPE)
.asInt());
@@ -742,7 +730,7 @@ bool RPCServiceImpl::ConvertSOtoMessage(
if (protocol_version == 1) {
if (!formatters::CFormatterJsonSDLRPCv1::toString(
message, output_string, !allow_unknown_parameters)) {
- LOG4CXX_WARN(logger_, "Failed to serialize smart object");
+ SDL_LOG_WARN("Failed to serialize smart object");
return false;
}
output.set_protocol_version(
@@ -750,7 +738,7 @@ bool RPCServiceImpl::ConvertSOtoMessage(
} else {
if (!formatters::CFormatterJsonSDLRPCv2::toString(
message, output_string, !allow_unknown_parameters)) {
- LOG4CXX_WARN(logger_, "Failed to serialize smart object");
+ SDL_LOG_WARN("Failed to serialize smart object");
return false;
}
output.set_protocol_version(
@@ -763,7 +751,7 @@ bool RPCServiceImpl::ConvertSOtoMessage(
case 1: {
if (!formatters::FormatterJsonRpc::ToString(
message, output_string, !allow_unknown_parameters)) {
- LOG4CXX_WARN(logger_, "Failed to serialize smart object");
+ SDL_LOG_WARN("Failed to serialize smart object");
return false;
}
output.set_protocol_version(
@@ -775,7 +763,7 @@ bool RPCServiceImpl::ConvertSOtoMessage(
return false;
}
- LOG4CXX_DEBUG(logger_, "Conversion result: " << output_string);
+ SDL_LOG_DEBUG("Conversion result: " << output_string);
output.set_connection_key(message.getElement(jhs::S_PARAMS)
.getElement(strings::connection_key)
@@ -810,7 +798,7 @@ bool RPCServiceImpl::ConvertSOtoMessage(
output.set_binary_data(&binaryData);
}
- LOG4CXX_DEBUG(logger_, "Successfully parsed smart object into message");
+ SDL_LOG_DEBUG("Successfully parsed smart object into message");
return true;
}
View Lorry Controller Status