diff options
58 files changed, 196 insertions, 200 deletions
diff --git a/src/appMain/life_cycle.cc b/src/appMain/life_cycle.cc index ca629e2311..140a46dc0d 100644 --- a/src/appMain/life_cycle.cc +++ b/src/appMain/life_cycle.cc @@ -88,7 +88,7 @@ LifeCycle::LifeCycle() { } bool LifeCycle::StartComponents() { - LOG4CXX_INFO(logger_, "LifeCycle::StartComponents()"); + LOG4CXX_AUTO_TRACE(logger_); transport_manager_ = transport_manager::TransportManagerDefault::instance(); DCHECK(transport_manager_ != NULL); diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h index af991186fd..5a39891839 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h @@ -60,7 +60,7 @@ class VIGetVehicleDataRequestTemplate : public RequestToHMI { * @brief Execute command with sending DBus thin request to HMI **/ virtual void Run() { - LOG4CXX_INFO(logger_, "VIGetVehicleDataRequestTemplate::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h index 156664cac3..9942110ca8 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h @@ -58,7 +58,7 @@ class VIGetVehicleDataResponseTemplate : public ResponseFromHMI { * @brief Execute command **/ virtual void Run() { - LOG4CXX_INFO(logger_, "VIGetVehicleDataResponseTemplate::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(eventID); event.set_smart_object(*message_); event.raise(); diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h index fc9b7dd2ea..5cf16c3610 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h @@ -61,7 +61,7 @@ class VISubscribeVehicleDataRequestTemplate : public RequestToHMI { * @brief Execute command with sending DBus thin request to HMI **/ virtual void Run() { - LOG4CXX_INFO(logger_, "VISubscriveVehicleDataRequestTemplate::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h index 64f3c51cbc..be67ab0106 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h @@ -58,7 +58,7 @@ class VISubscribeVehicleDataResponseTemplate : public ResponseFromHMI { * @brief Execute command **/ virtual void Run() { - LOG4CXX_INFO(logger_, "VISubscribeVehicleDataResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(eventID); event.set_smart_object(*message_); event.raise(); diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h index 9aa529d407..6014078ce3 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h @@ -61,7 +61,7 @@ class VIUnsubscribeVehicleDataRequestTemplate : public RequestToHMI { * @brief Execute command with sending DBus thin request to HMI **/ virtual void Run() { - LOG4CXX_INFO(logger_, "VIUnsubscriveVehicleDataRequestTemplate::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h index 3dfcc763cb..a74f71fdf2 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h @@ -59,7 +59,7 @@ class VIUnsubscribeVehicleDataResponseTemplate : public ResponseFromHMI { * @brief Execute command **/ virtual void Run() { - LOG4CXX_INFO(logger_, "VIUnsubscriveVehicleDataResponseTemplate::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(eventID); event.set_smart_object(*message_); event.raise(); diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index a1efd57441..3791fa51a8 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -1221,7 +1221,7 @@ void ApplicationManagerImpl::SendMessageToMobile( (*message)[strings::params][strings::connection_key].asUInt()); if (!app) { - LOG4CXX_ERROR_EXT(logger_, + LOG4CXX_ERROR(logger_, "No application associated with connection key"); if ((*message)[strings::msg_params].keyExists(strings::result_code) && ((*message)[strings::msg_params][strings::result_code] == @@ -1359,7 +1359,7 @@ bool ApplicationManagerImpl::ManageMobileCommand( (mobile_apis::FunctionID::UnregisterAppInterfaceID != function_id)) { app = ApplicationManagerImpl::instance()->application(connection_key); if (!app) { - LOG4CXX_ERROR_EXT(logger_, "RET APPLICATION_NOT_REGISTERED"); + LOG4CXX_ERROR(logger_, "RET APPLICATION_NOT_REGISTERED"); smart_objects::SmartObjectSPtr response = MessageHelper::CreateNegativeResponse(connection_key, static_cast<int32_t>(function_id), @@ -1414,7 +1414,7 @@ bool ApplicationManagerImpl::ManageMobileCommand( } else if (result == request_controller::RequestController:: TOO_MANY_PENDING_REQUESTS) { - LOG4CXX_ERROR_EXT(logger_, "RET Unable top perform request: " << + LOG4CXX_ERROR(logger_, "RET Unable top perform request: " << "TOO_MANY_PENDING_REQUESTS"); smart_objects::SmartObjectSPtr response = @@ -1427,7 +1427,7 @@ bool ApplicationManagerImpl::ManageMobileCommand( return false; } else if (result == request_controller::RequestController::TOO_MANY_REQUESTS) { - LOG4CXX_ERROR_EXT(logger_, "RET Unable to perform request: " << + LOG4CXX_ERROR(logger_, "RET Unable to perform request: " << "TOO_MANY_REQUESTS"); MessageHelper::SendOnAppInterfaceUnregisteredNotificationToMobile( @@ -1441,7 +1441,7 @@ bool ApplicationManagerImpl::ManageMobileCommand( } else if (result == request_controller::RequestController:: NONE_HMI_LEVEL_MANY_REQUESTS) { - LOG4CXX_ERROR_EXT(logger_, "RET Unable to perform request: " << + LOG4CXX_ERROR(logger_, "RET Unable to perform request: " << "REQUEST_WHILE_IN_NONE_HMI_LEVEL"); MessageHelper::SendOnAppInterfaceUnregisteredNotificationToMobile( @@ -1456,7 +1456,7 @@ bool ApplicationManagerImpl::ManageMobileCommand( false); return false; } else { - LOG4CXX_ERROR_EXT(logger_, "RET Unable to perform request: Unknown case"); + LOG4CXX_ERROR(logger_, "RET Unable to perform request: Unknown case"); return false; } return true; @@ -1859,7 +1859,7 @@ utils::SharedPtr<Message> ApplicationManagerImpl::ConvertRawMsgToMessage( void ApplicationManagerImpl::ProcessMessageFromMobile( const utils::SharedPtr<Message> message) { - LOG4CXX_INFO(logger_, "ApplicationManagerImpl::ProcessMessageFromMobile()"); + LOG4CXX_AUTO_TRACE(logger_); #ifdef TIME_TESTER AMMetricObserver::MessageMetricSharedPtr metric(new AMMetricObserver::MessageMetric()); metric->begin = date_time::DateTime::getCurrentTime(); @@ -1893,7 +1893,7 @@ void ApplicationManagerImpl::ProcessMessageFromMobile( void ApplicationManagerImpl::ProcessMessageFromHMI( const utils::SharedPtr<Message> message) { - LOG4CXX_INFO(logger_, "ApplicationManagerImpl::ProcessMessageFromHMI()"); + LOG4CXX_AUTO_TRACE(logger_); smart_objects::SmartObjectSPtr smart_object(new smart_objects::SmartObject); if (!smart_object) { @@ -2456,11 +2456,11 @@ void ApplicationManagerImpl::Handle(const impl::AudioData message) { smart_objects::SmartObjectSPtr on_audio_pass = new smart_objects::SmartObject(); if (!on_audio_pass) { - LOG4CXX_ERROR_EXT(logger_, "OnAudioPassThru NULL pointer"); + LOG4CXX_ERROR(logger_, "OnAudioPassThru NULL pointer"); return; } - LOG4CXX_INFO_EXT(logger_, "Fill smart object"); + LOG4CXX_INFO(logger_, "Fill smart object"); (*on_audio_pass)[strings::params][strings::message_type] = application_manager::MessageType::kNotification; @@ -2470,14 +2470,14 @@ void ApplicationManagerImpl::Handle(const impl::AudioData message) { (*on_audio_pass)[strings::params][strings::function_id] = mobile_apis::FunctionID::OnAudioPassThruID; - LOG4CXX_INFO_EXT(logger_, "Fill binary data"); + LOG4CXX_INFO(logger_, "Fill binary data"); // binary data (*on_audio_pass)[strings::params][strings::binary_data] = smart_objects::SmartObject(message.binary_data); - LOG4CXX_INFO_EXT(logger_, "After fill binary data"); + LOG4CXX_INFO(logger_, "After fill binary data"); - LOG4CXX_INFO_EXT(logger_, "Send data"); + LOG4CXX_INFO(logger_, "Send data"); CommandSharedPtr command ( MobileCommandFactory::CreateCommand(on_audio_pass, commands::Command::ORIGIN_SDL)); @@ -2492,7 +2492,7 @@ mobile_apis::Result::eType ApplicationManagerImpl::CheckPolicyPermissions( mobile_apis::FunctionID::eType function_id, const RPCParams& rpc_params, CommandParametersPermissions* params_permissions) { - LOG4CXX_INFO(logger_, "CheckPolicyPermissions"); + LOG4CXX_AUTO_TRACE(logger_); // TODO(AOleynik): Remove check of policy_enable, when this flag will be // unused in config file if (!policy::PolicyHandler::instance()->PolicyEnabled()) { diff --git a/src/components/application_manager/src/commands/command_request_impl.cc b/src/components/application_manager/src/commands/command_request_impl.cc index 544b12a290..dc4bbc06d7 100644 --- a/src/components/application_manager/src/commands/command_request_impl.cc +++ b/src/components/application_manager/src/commands/command_request_impl.cc @@ -361,7 +361,7 @@ mobile_apis::Result::eType CommandRequestImpl::GetMobileResultCode( } bool CommandRequestImpl::CheckAllowedParameters() { - LOG4CXX_INFO(logger_, "CheckAllowedParameters"); + LOG4CXX_AUTO_TRACE(logger_); // RegisterAppInterface should always be allowed if (mobile_apis::FunctionID::RegisterAppInterfaceID == @@ -429,7 +429,7 @@ bool CommandRequestImpl::CheckAllowedParameters() { void CommandRequestImpl::RemoveDisallowedParameters( const CommandParametersPermissions& params_permissions) { - LOG4CXX_INFO(logger_, "RemoveDisallowedParameters"); + LOG4CXX_AUTO_TRACE(logger_); smart_objects::SmartObject& params = (*message_)[strings::msg_params]; diff --git a/src/components/application_manager/src/commands/hmi/on_app_deactivated_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_deactivated_notification.cc index 3df1c566d9..a146bdf3a0 100644 --- a/src/components/application_manager/src/commands/hmi/on_app_deactivated_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_app_deactivated_notification.cc @@ -75,11 +75,11 @@ void OnAppDeactivatedNotification::Run() { app = ApplicationManagerImpl::instance()->active_application(); if (!app.valid()) { - LOG4CXX_ERROR_EXT(logger_, "No active application"); + LOG4CXX_ERROR(logger_, "No active application"); return; } if (app_id != app->app_id()) { - LOG4CXX_ERROR_EXT(logger_, "Wrong application id"); + LOG4CXX_ERROR(logger_, "Wrong application id"); return; } } diff --git a/src/components/application_manager/src/commands/hmi/on_driver_distraction_notification.cc b/src/components/application_manager/src/commands/hmi/on_driver_distraction_notification.cc index ceb6e1b586..5cfd6b1146 100644 --- a/src/components/application_manager/src/commands/hmi/on_driver_distraction_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_driver_distraction_notification.cc @@ -64,7 +64,7 @@ void OnDriverDistractionNotification::Run() { new smart_objects::SmartObject(); if (!on_driver_distraction) { - LOG4CXX_ERROR_EXT(logger_, "NULL pointer"); + LOG4CXX_ERROR(logger_, "NULL pointer"); return; } diff --git a/src/components/application_manager/src/commands/hmi/on_sdl_close_notification.cc b/src/components/application_manager/src/commands/hmi/on_sdl_close_notification.cc index c393219134..56ebcced4e 100644 --- a/src/components/application_manager/src/commands/hmi/on_sdl_close_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_sdl_close_notification.cc @@ -44,7 +44,7 @@ OnSDLCloseNotification::~OnSDLCloseNotification() { } void OnSDLCloseNotification::Run() { - LOG4CXX_INFO(logger_, "OnSdlCloseNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendNotification(); } diff --git a/src/components/application_manager/src/commands/hmi/on_sdl_persistence_complete_notification.cc b/src/components/application_manager/src/commands/hmi/on_sdl_persistence_complete_notification.cc index afe0ffeabc..ff39131a28 100644 --- a/src/components/application_manager/src/commands/hmi/on_sdl_persistence_complete_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_sdl_persistence_complete_notification.cc @@ -45,7 +45,7 @@ OnSDLPersistenceCompleteNotification::~OnSDLPersistenceCompleteNotification() { } void OnSDLPersistenceCompleteNotification::Run() { - LOG4CXX_INFO(logger_, "OnSDLpersistenceCompleteNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendNotification(); } diff --git a/src/components/application_manager/src/commands/hmi/on_status_update_notification.cc b/src/components/application_manager/src/commands/hmi/on_status_update_notification.cc index 7db0053e2d..9f95d04380 100644 --- a/src/components/application_manager/src/commands/hmi/on_status_update_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_status_update_notification.cc @@ -45,7 +45,7 @@ OnStatusUpdateNotification::~OnStatusUpdateNotification() { } void OnStatusUpdateNotification::Run() { - LOG4CXX_INFO(logger_, "OnGetStatusUpdateNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendNotification(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_add_submenu_request.cc b/src/components/application_manager/src/commands/hmi/ui_add_submenu_request.cc index 667499584f..891b9a5e18 100644 --- a/src/components/application_manager/src/commands/hmi/ui_add_submenu_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_add_submenu_request.cc @@ -44,7 +44,7 @@ UIAddSubmenuRequest::~UIAddSubmenuRequest() { } void UIAddSubmenuRequest::Run() { - LOG4CXX_INFO(logger_, "UIAddCommandRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_set_icon_request.cc b/src/components/application_manager/src/commands/hmi/ui_set_icon_request.cc index b587a3028e..19612470b7 100644 --- a/src/components/application_manager/src/commands/hmi/ui_set_icon_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_set_icon_request.cc @@ -44,7 +44,7 @@ UISetIconRequest::~UISetIconRequest() { } void UISetIconRequest::Run() { - LOG4CXX_INFO(logger_, "UISetIconRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_set_icon_response.cc b/src/components/application_manager/src/commands/hmi/ui_set_icon_response.cc index f4565baaf1..5047c8ed16 100644 --- a/src/components/application_manager/src/commands/hmi/ui_set_icon_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_set_icon_response.cc @@ -45,7 +45,7 @@ UISetIconResponse::~UISetIconResponse() { } void UISetIconResponse::Run() { - LOG4CXX_INFO(logger_, "UISetIconResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_SetAppIcon); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/vr_change_registration_response.cc b/src/components/application_manager/src/commands/hmi/vr_change_registration_response.cc index 5bd2fb853a..1109d85337 100644 --- a/src/components/application_manager/src/commands/hmi/vr_change_registration_response.cc +++ b/src/components/application_manager/src/commands/hmi/vr_change_registration_response.cc @@ -46,7 +46,7 @@ VRChangeRegistrationResponse::~VRChangeRegistrationResponse() { } void VRChangeRegistrationResponse::Run() { - LOG4CXX_INFO(logger_, "VRChangeRegistratioResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::VR_ChangeRegistration); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/mobile/add_command_request.cc b/src/components/application_manager/src/commands/mobile/add_command_request.cc index 200b8da40a..666304bfe5 100644 --- a/src/components/application_manager/src/commands/mobile/add_command_request.cc +++ b/src/components/application_manager/src/commands/mobile/add_command_request.cc @@ -69,7 +69,7 @@ void AddCommandRequest::Run() { (*message_)[strings::params][strings::connection_key].asUInt()); if (!app) { - LOG4CXX_ERROR_EXT(logger_, "No application associated with session key"); + LOG4CXX_ERROR(logger_, "No application associated with session key"); SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED); return; } @@ -80,7 +80,7 @@ void AddCommandRequest::Run() { [strings::cmd_icon], app); if (mobile_apis::Result::SUCCESS != verification_result) { - LOG4CXX_ERROR_EXT( + LOG4CXX_ERROR( logger_, "MessageHelper::VerifyImage return " << verification_result); SendResponse(false, verification_result); @@ -89,14 +89,14 @@ void AddCommandRequest::Run() { } if (!((*message_)[strings::msg_params].keyExists(strings::cmd_id))) { - LOG4CXX_ERROR_EXT(logger_, "INVALID_DATA"); + LOG4CXX_ERROR(logger_, "INVALID_DATA"); SendResponse(false, mobile_apis::Result::INVALID_DATA); return; } if (app->FindCommand( (*message_)[strings::msg_params][strings::cmd_id].asUInt())) { - LOG4CXX_ERROR_EXT(logger_, "INVALID_ID"); + LOG4CXX_ERROR(logger_, "INVALID_ID"); SendResponse(false, mobile_apis::Result::INVALID_ID); return; } @@ -133,7 +133,7 @@ void AddCommandRequest::Run() { } if (!data_exist) { - LOG4CXX_ERROR_EXT(logger_, "INVALID_DATA"); + LOG4CXX_ERROR(logger_, "INVALID_DATA"); SendResponse(false, mobile_apis::Result::INVALID_DATA); return; } diff --git a/src/components/application_manager/src/commands/mobile/on_button_event_notification.cc b/src/components/application_manager/src/commands/mobile/on_button_event_notification.cc index 54575080cf..14735c50c4 100644 --- a/src/components/application_manager/src/commands/mobile/on_button_event_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_button_event_notification.cc @@ -61,14 +61,14 @@ void OnButtonEventNotification::Run() { if (static_cast<uint32_t>(mobile_apis::ButtonName::CUSTOM_BUTTON) == btn_id) { // app_id is mandatory for CUSTOM_BUTTON notification if (false == (*message_)[strings::msg_params].keyExists(strings::app_id)) { - LOG4CXX_ERROR_EXT(logger_, "CUSTOM_BUTTON OnButtonEvent without app_id."); + LOG4CXX_ERROR(logger_, "CUSTOM_BUTTON OnButtonEvent without app_id."); return; } // custom_button_id is mandatory for CUSTOM_BUTTON notification if (false == (*message_)[strings::msg_params].keyExists( hmi_response::custom_button_id)) { - LOG4CXX_ERROR_EXT(logger_, + LOG4CXX_ERROR(logger_, "CUSTOM_BUTTON OnButtonEvent without custom_button_id."); return; } @@ -77,7 +77,7 @@ void OnButtonEventNotification::Run() { (*message_)[strings::msg_params][strings::app_id].asUInt()); if (false == app.valid()) { - LOG4CXX_ERROR_EXT(logger_, "Application doesn't exist."); + LOG4CXX_ERROR(logger_, "Application doesn't exist."); return; } @@ -86,7 +86,7 @@ void OnButtonEventNotification::Run() { [hmi_response::custom_button_id].asUInt(); if (false == app->IsSubscribedToSoftButton(custom_btn_id)) { - LOG4CXX_ERROR_EXT(logger_, + LOG4CXX_ERROR(logger_, "Application doesn't subscribed to this custom_button_id."); return; } @@ -102,14 +102,14 @@ void OnButtonEventNotification::Run() { for (; subscribedApps.end() != it; ++it) { ApplicationSharedPtr subscribed_app = *it; if (!subscribed_app) { - LOG4CXX_WARN_EXT(logger_, "Null pointer to subscribed app."); + LOG4CXX_WARN(logger_, "Null pointer to subscribed app."); continue; } //Send ButtonEvent notification only in HMI_FULL or HMI_LIMITED mode if ((mobile_api::HMILevel::HMI_FULL != subscribed_app->hmi_level()) && (mobile_api::HMILevel::HMI_LIMITED != subscribed_app->hmi_level())) { - LOG4CXX_WARN_EXT(logger_, "OnButtonEvent in HMI_BACKGROUND or NONE"); + LOG4CXX_WARN(logger_, "OnButtonEvent in HMI_BACKGROUND or NONE"); continue; } @@ -125,14 +125,14 @@ void OnButtonEventNotification::Run() { void OnButtonEventNotification::SendButtonEvent(ApplicationConstSharedPtr app) { if (!app) { - LOG4CXX_ERROR_EXT(logger_, "OnButtonEvent NULL pointer"); + LOG4CXX_ERROR(logger_, "OnButtonEvent NULL pointer"); return; } smart_objects::SmartObjectSPtr on_btn_event = new smart_objects::SmartObject(); if (!on_btn_event) { - LOG4CXX_ERROR_EXT(logger_, "OnButtonEvent NULL pointer"); + LOG4CXX_ERROR(logger_, "OnButtonEvent NULL pointer"); return; } diff --git a/src/components/application_manager/src/commands/mobile/on_button_press_notification.cc b/src/components/application_manager/src/commands/mobile/on_button_press_notification.cc index 86fe664f86..9d97d92b3a 100644 --- a/src/components/application_manager/src/commands/mobile/on_button_press_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_button_press_notification.cc @@ -61,14 +61,14 @@ void OnButtonPressNotification::Run() { if (static_cast<uint32_t>(mobile_apis::ButtonName::CUSTOM_BUTTON) == btn_id) { // app_id is mandatory for CUSTOM_BUTTON notification if (false == (*message_)[strings::msg_params].keyExists(strings::app_id)) { - LOG4CXX_ERROR_EXT(logger_, "CUSTOM_BUTTON OnButtonPress without app_id."); + LOG4CXX_ERROR(logger_, "CUSTOM_BUTTON OnButtonPress without app_id."); return; } // custom_button_id is mandatory for CUSTOM_BUTTON notification if (false == (*message_)[strings::msg_params].keyExists( hmi_response::custom_button_id)) { - LOG4CXX_ERROR_EXT(logger_, + LOG4CXX_ERROR(logger_, "CUSTOM_BUTTON OnButtonPress without custom_button_id."); return; } @@ -77,7 +77,7 @@ void OnButtonPressNotification::Run() { (*message_)[strings::msg_params][strings::app_id].asUInt()); if (false == app.valid()) { - LOG4CXX_ERROR_EXT(logger_, "Application doesn't exist."); + LOG4CXX_ERROR(logger_, "Application doesn't exist."); return; } @@ -86,7 +86,7 @@ void OnButtonPressNotification::Run() { [hmi_response::custom_button_id].asUInt(); if (false == app->IsSubscribedToSoftButton(custom_btn_id)) { - LOG4CXX_ERROR_EXT(logger_, + LOG4CXX_ERROR(logger_, "Application doesn't subscribed to this custom_button_id."); return; } @@ -102,14 +102,14 @@ void OnButtonPressNotification::Run() { for (; subscribedApps.end() != it; ++it) { ApplicationSharedPtr subscribed_app = *it; if (!subscribed_app) { - LOG4CXX_WARN_EXT(logger_, "Null pointer to subscribed app."); + LOG4CXX_WARN(logger_, "Null pointer to subscribed app."); continue; } //Send ButtonPress notification only in HMI_FULL or HMI_LIMITED mode if ((mobile_api::HMILevel::HMI_FULL != subscribed_app->hmi_level()) && (mobile_api::HMILevel::HMI_LIMITED != subscribed_app->hmi_level())) { - LOG4CXX_WARN_EXT(logger_, "OnButtonPress in HMI_BACKGROUND or NONE"); + LOG4CXX_WARN(logger_, "OnButtonPress in HMI_BACKGROUND or NONE"); continue; } @@ -125,14 +125,14 @@ void OnButtonPressNotification::Run() { void OnButtonPressNotification::SendButtonPress(ApplicationConstSharedPtr app) { if (!app) { - LOG4CXX_ERROR_EXT(logger_, "OnButtonPress NULL pointer"); + LOG4CXX_ERROR(logger_, "OnButtonPress NULL pointer"); return; } smart_objects::SmartObjectSPtr on_btn_press = new smart_objects::SmartObject(); if (!on_btn_press) { - LOG4CXX_ERROR_EXT(logger_, "OnButtonPress NULL pointer"); + LOG4CXX_ERROR(logger_, "OnButtonPress NULL pointer"); return; } diff --git a/src/components/application_manager/src/commands/mobile/on_command_notification.cc b/src/components/application_manager/src/commands/mobile/on_command_notification.cc index 9bba1851f6..922fcad525 100644 --- a/src/components/application_manager/src/commands/mobile/on_command_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_command_notification.cc @@ -53,7 +53,7 @@ void OnCommandNotification::Run() { (*message_)[strings::msg_params][strings::app_id].asInt()); if (!app) { - LOG4CXX_ERROR_EXT(logger_, "No application associated with session key"); + LOG4CXX_ERROR(logger_, "No application associated with session key"); return; } @@ -61,7 +61,7 @@ void OnCommandNotification::Run() { .asUInt(); if (!app->FindCommand(cmd_id)) { - LOG4CXX_ERROR_EXT(logger_, + LOG4CXX_ERROR(logger_, " No applications found for the command " << cmd_id); return; } diff --git a/src/components/application_manager/src/commands/mobile/on_vehicle_data_notification.cc b/src/components/application_manager/src/commands/mobile/on_vehicle_data_notification.cc index 044bb16b40..b499d9aff8 100644 --- a/src/components/application_manager/src/commands/mobile/on_vehicle_data_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_vehicle_data_notification.cc @@ -65,7 +65,7 @@ void OnVehicleDataNotification::Run() { for (; applications.end() != it; ++it) { utils::SharedPtr<Application> app = *it; if (!app) { - LOG4CXX_ERROR_EXT(logger_, "NULL pointer"); + LOG4CXX_ERROR(logger_, "NULL pointer"); continue; } diff --git a/src/components/application_manager/src/commands/mobile/read_did_request.cc b/src/components/application_manager/src/commands/mobile/read_did_request.cc index 18f43f12ca..216e957d13 100644 --- a/src/components/application_manager/src/commands/mobile/read_did_request.cc +++ b/src/components/application_manager/src/commands/mobile/read_did_request.cc @@ -59,7 +59,7 @@ void ReadDIDRequest::Run() { .asUInt()); if (!app) { - LOG4CXX_ERROR_EXT(logger_, "An application is not registered."); + LOG4CXX_ERROR(logger_, "An application is not registered."); SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED); return; } @@ -73,7 +73,7 @@ void ReadDIDRequest::Run() { } if ((*message_)[strings::msg_params][strings::did_location].empty()) { - LOG4CXX_ERROR_EXT(logger_, "INVALID_DATA"); + LOG4CXX_ERROR(logger_, "INVALID_DATA"); SendResponse(false, mobile_apis::Result::INVALID_DATA); return; } diff --git a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc index 660f07af7b..ce21ceedb2 100644 --- a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc +++ b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc @@ -198,7 +198,7 @@ void RegisterAppInterfaceRequest::Run() { mobile_apis::Result::eType coincidence_result = CheckCoincidence(); if (mobile_apis::Result::SUCCESS != coincidence_result) { - LOG4CXX_ERROR_EXT(logger_, "Coincidence check failed."); + LOG4CXX_ERROR(logger_, "Coincidence check failed."); if (mobile_apis::Result::DUPLICATE_NAME == coincidence_result) { usage_statistics::AppCounter count_of_rejections_duplicate_name( policy::PolicyHandler::instance()->GetStatisticManager(), mobile_app_id, @@ -223,7 +223,7 @@ void RegisterAppInterfaceRequest::Run() { ApplicationManagerImpl::instance()->RegisterApplication(message_); if (!application) { - LOG4CXX_ERROR_EXT(logger_, "Application " << + LOG4CXX_ERROR(logger_, "Application " << msg_params[strings::app_name].asString() << " hasn't been registered!"); } else { @@ -336,11 +336,11 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile() { msg_params[strings::hmi_display_language_desired].asInt() != hmi_capabilities.active_ui_language()) { - LOG4CXX_WARN_EXT( + LOG4CXX_WARN( logger_, "Wrong language on registering application " << application->name()); - LOG4CXX_ERROR_EXT( + LOG4CXX_ERROR( logger_, "vr " << msg_params[strings::language_desired].asInt() @@ -583,7 +583,7 @@ RegisterAppInterfaceRequest::CheckCoincidence() { } // method end mobile_apis::Result::eType RegisterAppInterfaceRequest::CheckWithPolicyData() { - LOG4CXX_INFO(logger_, "CheckWithPolicyData"); + LOG4CXX_AUTO_TRACE(logger_); // TODO(AOleynik): Check is necessary to allow register application in case // of disabled policy // Remove this check, when HMI will support policy diff --git a/src/components/application_manager/src/commands/mobile/reset_global_properties_request.cc b/src/components/application_manager/src/commands/mobile/reset_global_properties_request.cc index 7472324ed9..6cf37bf6f6 100644 --- a/src/components/application_manager/src/commands/mobile/reset_global_properties_request.cc +++ b/src/components/application_manager/src/commands/mobile/reset_global_properties_request.cc @@ -64,7 +64,7 @@ void ResetGlobalPropertiesRequest::Run() { ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(app_id); if (!app) { - LOG4CXX_ERROR_EXT(logger_, "No application associated with session key"); + LOG4CXX_ERROR(logger_, "No application associated with session key"); SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED); return; } @@ -185,7 +185,7 @@ void ResetGlobalPropertiesRequest::Run() { bool ResetGlobalPropertiesRequest::ResetHelpPromt( application_manager::ApplicationSharedPtr app) { if (!app) { - LOG4CXX_ERROR_EXT(logger_, "Null pointer"); + LOG4CXX_ERROR(logger_, "Null pointer"); SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED); return false; } @@ -198,7 +198,7 @@ bool ResetGlobalPropertiesRequest::ResetHelpPromt( bool ResetGlobalPropertiesRequest::ResetTimeoutPromt( application_manager::ApplicationSharedPtr const app) { if (!app) { - LOG4CXX_ERROR_EXT(logger_, "Null pointer"); + LOG4CXX_ERROR(logger_, "Null pointer"); SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED); return false; } @@ -225,7 +225,7 @@ bool ResetGlobalPropertiesRequest::ResetTimeoutPromt( bool ResetGlobalPropertiesRequest::ResetVrHelpTitleItems( application_manager::ApplicationSharedPtr const app) { if (!app) { - LOG4CXX_ERROR_EXT(logger_, "Null pointer"); + LOG4CXX_ERROR(logger_, "Null pointer"); SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED); return false; } diff --git a/src/components/application_manager/src/commands/mobile/send_location_request.cc b/src/components/application_manager/src/commands/mobile/send_location_request.cc index b1c96ebb98..4a30b7c50c 100644 --- a/src/components/application_manager/src/commands/mobile/send_location_request.cc +++ b/src/components/application_manager/src/commands/mobile/send_location_request.cc @@ -53,7 +53,7 @@ void SendLocationRequest::Run() { ->application(connection_key()); if (!app) { - LOG4CXX_ERROR_EXT(logger_, + LOG4CXX_ERROR(logger_, "An application with connection key " << connection_key() << " is not registered."); SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED); @@ -109,7 +109,7 @@ void SendLocationRequest::Run() { } void SendLocationRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "SendLocationRquest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { case hmi_apis::FunctionID::Navigation_SendLocation: { @@ -132,7 +132,7 @@ void SendLocationRequest::on_event(const event_engine::Event& event) { } bool SendLocationRequest::IsWhiteSpaceExist() { - LOG4CXX_INFO(logger_, "SendLocationRquest::IsWhiteSpaceExist"); + LOG4CXX_AUTO_TRACE(logger_); const char* str; const smart_objects::SmartObject& msg_params = (*message_)[strings::msg_params]; @@ -202,7 +202,7 @@ bool SendLocationRequest::CheckHMICapabilities(std::list<hmi_apis::Common_TextFi ApplicationManagerImpl* instance = ApplicationManagerImpl::instance(); const HMICapabilities& hmi_capabilities = instance->hmi_capabilities(); if (!hmi_capabilities.is_ui_cooperating()) { - LOG4CXX_ERROR_EXT(logger_, "UI is not supported."); + LOG4CXX_ERROR(logger_, "UI is not supported."); return false; } @@ -223,7 +223,7 @@ bool SendLocationRequest::CheckHMICapabilities(std::list<hmi_apis::Common_TextFi } if (!fields_names.empty()) { - LOG4CXX_ERROR_EXT(logger_, "Some fields are not supported by capabilities"); + LOG4CXX_ERROR(logger_, "Some fields are not supported by capabilities"); return false; } return true; diff --git a/src/components/application_manager/src/commands/mobile/set_icon_request.cc b/src/components/application_manager/src/commands/mobile/set_icon_request.cc index 4b06730752..c9875475d7 100644 --- a/src/components/application_manager/src/commands/mobile/set_icon_request.cc +++ b/src/components/application_manager/src/commands/mobile/set_icon_request.cc @@ -51,7 +51,7 @@ SetIconRequest::~SetIconRequest() { } void SetIconRequest::Run() { - LOG4CXX_INFO(logger_, "SetIconRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(connection_key()); @@ -102,7 +102,7 @@ void SetIconRequest::Run() { } void SetIconRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "SetIconRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { diff --git a/src/components/application_manager/src/commands/mobile/set_icon_response.cc b/src/components/application_manager/src/commands/mobile/set_icon_response.cc index f1580823d1..632677a4fc 100644 --- a/src/components/application_manager/src/commands/mobile/set_icon_response.cc +++ b/src/components/application_manager/src/commands/mobile/set_icon_response.cc @@ -46,7 +46,7 @@ SetIconResponse::~SetIconResponse() { } void SetIconResponse::Run() { - LOG4CXX_INFO(logger_, "SetIconResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/speak_request.cc b/src/components/application_manager/src/commands/mobile/speak_request.cc index 53703fefed..7b0bc785e1 100644 --- a/src/components/application_manager/src/commands/mobile/speak_request.cc +++ b/src/components/application_manager/src/commands/mobile/speak_request.cc @@ -57,7 +57,7 @@ void SpeakRequest::Run() { connection_key()); if (!app) { - LOG4CXX_ERROR_EXT(logger_, "NULL pointer"); + LOG4CXX_ERROR(logger_, "NULL pointer"); SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED); return; } diff --git a/src/components/application_manager/src/commands/mobile/subscribe_button_request.cc b/src/components/application_manager/src/commands/mobile/subscribe_button_request.cc index 22bc57620a..9be2251a67 100644 --- a/src/components/application_manager/src/commands/mobile/subscribe_button_request.cc +++ b/src/components/application_manager/src/commands/mobile/subscribe_button_request.cc @@ -54,7 +54,7 @@ void SubscribeButtonRequest::Run() { ApplicationManagerImpl::instance()->application(connection_key()); if (!app) { - LOG4CXX_ERROR_EXT(logger_, "APPLICATION_NOT_REGISTERED"); + LOG4CXX_ERROR(logger_, "APPLICATION_NOT_REGISTERED"); SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED); return; } @@ -64,21 +64,21 @@ void SubscribeButtonRequest::Run() { (*message_)[str::msg_params][str::button_name].asUInt()); if (!IsSubscriptionAllowed(app, btn_id)) { - LOG4CXX_ERROR_EXT(logger_, "Subscribe on button " << btn_id + LOG4CXX_ERROR(logger_, "Subscribe on button " << btn_id << " isn't allowed"); SendResponse(false, mobile_apis::Result::REJECTED); return; } if (!CheckHMICapabilities(btn_id)) { - LOG4CXX_ERROR_EXT(logger_, "Subscribe on button " << btn_id + LOG4CXX_ERROR(logger_, "Subscribe on button " << btn_id << " isn't allowed by HMI capabilities"); SendResponse(false, mobile_apis::Result::UNSUPPORTED_RESOURCE); return; } if (app->IsSubscribedToButton(btn_id)) { - LOG4CXX_ERROR_EXT(logger_, "Already subscribed to button " << btn_id); + LOG4CXX_ERROR(logger_, "Already subscribed to button " << btn_id); SendResponse(false, mobile_apis::Result::IGNORED); return; } @@ -119,7 +119,7 @@ bool SubscribeButtonRequest::CheckHMICapabilities( const HMICapabilities& hmi_caps = app_mgr->hmi_capabilities(); if (!hmi_caps.is_ui_cooperating()) { - LOG4CXX_ERROR_EXT(logger_, "UI is not supported by HMI."); + LOG4CXX_ERROR(logger_, "UI is not supported by HMI."); return false; } diff --git a/src/components/application_manager/src/commands/mobile/unsubscribe_button_request.cc b/src/components/application_manager/src/commands/mobile/unsubscribe_button_request.cc index a2958342ea..ef0b9a9a73 100644 --- a/src/components/application_manager/src/commands/mobile/unsubscribe_button_request.cc +++ b/src/components/application_manager/src/commands/mobile/unsubscribe_button_request.cc @@ -56,7 +56,7 @@ void UnsubscribeButtonRequest::Run() { ApplicationManagerImpl::instance()->application(connection_key()); if (!app) { - LOG4CXX_ERROR_EXT(logger_, "APPLICATION_NOT_REGISTERED"); + LOG4CXX_ERROR(logger_, "APPLICATION_NOT_REGISTERED"); SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED); return; } @@ -65,7 +65,7 @@ void UnsubscribeButtonRequest::Run() { (*message_)[str::msg_params][str::button_name].asUInt(); if (!app->IsSubscribedToButton(static_cast<mobile_apis::ButtonName::eType>(btn_id))) { - LOG4CXX_ERROR_EXT(logger_, "App doesn't subscibe to button " << btn_id); + LOG4CXX_ERROR(logger_, "App doesn't subscibe to button " << btn_id); SendResponse(false, mobile_apis::Result::IGNORED); return; } diff --git a/src/components/application_manager/src/commands/mobile/update_turn_list_request.cc b/src/components/application_manager/src/commands/mobile/update_turn_list_request.cc index 650e698bf4..42262eb856 100644 --- a/src/components/application_manager/src/commands/mobile/update_turn_list_request.cc +++ b/src/components/application_manager/src/commands/mobile/update_turn_list_request.cc @@ -87,7 +87,7 @@ void UpdateTurnListRequest::Run() { if((turn_list_array[i].keyExists(strings::turn_icon)) && (mobile_apis::Result::SUCCESS != MessageHelper::VerifyImage( turn_list_array[i][strings::turn_icon], app))) { - LOG4CXX_ERROR_EXT( + LOG4CXX_ERROR( logger_, "MessageHelper::VerifyImage return INVALID_DATA"); SendResponse(false, mobile_apis::Result::INVALID_DATA); diff --git a/src/components/application_manager/src/message_helper.cc b/src/components/application_manager/src/message_helper.cc index ca3b7ebb49..19beb05b1c 100644 --- a/src/components/application_manager/src/message_helper.cc +++ b/src/components/application_manager/src/message_helper.cc @@ -409,7 +409,7 @@ smart_objects::SmartObject* MessageHelper::GetLockScreenIconUrlNotification(cons } void MessageHelper::SendLockScreenIconUrlNotification(const uint32_t connection_key) { - LOG4CXX_INFO(logger_, "SendLockScreenIconUrlNotification"); + LOG4CXX_AUTO_TRACE(logger_); smart_objects::SmartObject* so = GetLockScreenIconUrlNotification(connection_key); PrintSmartObject(*so); @@ -423,7 +423,7 @@ void MessageHelper::SendHashUpdateNotification(const uint32_t app_id) { if (so) { PrintSmartObject(*so); if (!ApplicationManagerImpl::instance()->ManageMobileCommand(so)) { - LOG4CXX_ERROR_EXT(logger_, "Failed to send HashUpdate notification."); + LOG4CXX_ERROR(logger_, "Failed to send HashUpdate notification."); } else { ApplicationManagerImpl::instance()->resume_controller().ApplicationsDataUpdated(); } diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc index 062a18214b..97ee71b67d 100644 --- a/src/components/application_manager/src/policies/policy_handler.cc +++ b/src/components/application_manager/src/policies/policy_handler.cc @@ -1198,7 +1198,7 @@ void PolicyHandler::RemoveDevice(const std::string& device_id) { } bool PolicyHandler::IsApplicationRevoked(const std::string& app_id) { - LOG4CXX_TRACE(logger_, "PolicyHandler::IsApplicationRevoked"); + LOG4CXX_AUTO_TRACE(logger_); POLICY_LIB_CHECK(false); return policy_manager_->IsApplicationRevoked(app_id); diff --git a/src/components/application_manager/src/resumption/resumption_data_json.cc b/src/components/application_manager/src/resumption/resumption_data_json.cc index 8e073548a5..de6c2b6bfc 100644 --- a/src/components/application_manager/src/resumption/resumption_data_json.cc +++ b/src/components/application_manager/src/resumption/resumption_data_json.cc @@ -212,8 +212,8 @@ void ResumptionDataJson::OnSuspend() { void ResumptionDataJson::OnAwake() { using namespace app_mngr; - sync_primitives::AutoLock autolock(resumption_lock_); LOG4CXX_AUTO_TRACE(logger_); + sync_primitives::AutoLock autolock(resumption_lock_); for (Json::Value::iterator it = GetSavedApplications().begin(); it != GetSavedApplications().end(); ++it) { @@ -468,8 +468,8 @@ void ResumptionDataJson::SetSavedApplication(Json::Value& apps_json) { void ResumptionDataJson::SetLastIgnOffTime(time_t ign_off_time) { using namespace app_mngr; - sync_primitives::AutoLock autolock(resumption_lock_); LOG4CXX_AUTO_TRACE(logger_); + sync_primitives::AutoLock autolock(resumption_lock_); LOG4CXX_WARN(logger_, "ign_off_time = " << ign_off_time); Json::Value& resumption = GetResumptionData(); resumption[strings::last_ign_off_time] = static_cast<uint32_t>(ign_off_time); diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/dial_number_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/dial_number_request.h deleted file mode 120000 index 54019461dc..0000000000 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/dial_number_request.h +++ /dev/null @@ -1 +0,0 @@ -/home/dklimenko/projects/github/sdl_panasonic/src/components/application_manager/include/application_manager/commands/hmi/dial_number_request.h
\ No newline at end of file diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/dial_number_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/dial_number_response.h deleted file mode 120000 index a82e03335e..0000000000 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/dial_number_response.h +++ /dev/null @@ -1 +0,0 @@ -/home/dklimenko/projects/github/sdl_panasonic/src/components/application_manager/include/application_manager/commands/hmi/dial_number_response.h
\ No newline at end of file diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/dial_number_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/dial_number_response.h deleted file mode 120000 index 5f3d1f8983..0000000000 --- a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/dial_number_response.h +++ /dev/null @@ -1 +0,0 @@ -/home/dklimenko/projects/github/sdl_panasonic/src/components/application_manager/include/application_manager/commands/mobile/dial_number_response.h
\ No newline at end of file diff --git a/src/components/application_manager/test/mock/include/application_manager/resume_ctrl.h b/src/components/application_manager/test/mock/include/application_manager/resume_ctrl.h deleted file mode 120000 index 889e967d4e..0000000000 --- a/src/components/application_manager/test/mock/include/application_manager/resume_ctrl.h +++ /dev/null @@ -1 +0,0 @@ -../../../../include/application_manager/resume_ctrl.h
\ No newline at end of file diff --git a/src/components/connection_handler/src/connection_handler_impl.cc b/src/components/connection_handler/src/connection_handler_impl.cc index b7c7161f82..1fbe26a8f7 100644 --- a/src/components/connection_handler/src/connection_handler_impl.cc +++ b/src/components/connection_handler/src/connection_handler_impl.cc @@ -236,7 +236,7 @@ void ConnectionHandlerImpl::OnConnectionClosedFailure( void ConnectionHandlerImpl::OnUnexpectedDisconnect( transport_manager::ConnectionUID connection_id, const transport_manager::CommunicationError &error) { - LOG4CXX_ERROR(logger_, "ConnectionHandlerImpl::OnUnexpectedDisconnect"); + LOG4CXX_AUTO_TRACE(logger_); OnConnectionEnded(connection_id); } @@ -257,7 +257,7 @@ void ConnectionHandlerImpl::OnDisconnectFailed( void ConnectionHandlerImpl::RemoveConnection( const ConnectionHandle connection_handle) { - LOG4CXX_INFO(logger_, "ConnectionHandlerImpl::RemoveConnection()"); + LOG4CXX_AUTO_TRACE(logger_); OnConnectionEnded(connection_handle); } @@ -675,7 +675,7 @@ void ConnectionHandlerImpl::ConnectToDevice( connection_handler::DeviceMap::const_iterator it_in; it_in = device_list_.find(device_handle); if (device_list_.end() != it_in) { - LOG4CXX_INFO_EXT(logger_, + LOG4CXX_INFO(logger_, "Connecting to device with handle " << device_handle); if (transport_manager_) { if (transport_manager::E_SUCCESS @@ -699,7 +699,7 @@ void ConnectionHandlerImpl::ConnectToAllDevices() { } void ConnectionHandlerImpl::StartTransportManager() { - LOG4CXX_INFO(logger_, "ConnectionHandlerImpl::StartTransportManager()"); + LOG4CXX_AUTO_TRACE(logger_); if (NULL == transport_manager_) { LOG4CXX_ERROR(logger_, "Null pointer to TransportManager."); return; diff --git a/src/components/dbus/src/dbus_adapter.cc b/src/components/dbus/src/dbus_adapter.cc index 5f38e3d80f..4f0cb74527 100644 --- a/src/components/dbus/src/dbus_adapter.cc +++ b/src/components/dbus/src/dbus_adapter.cc @@ -348,7 +348,7 @@ bool DBusAdapter::ProcessMethodCall(DBusMessage* msg, bool DBusAdapter::ProcessMethodReturn(DBusMessage* msg, smart_objects::SmartObject& obj) { - LOG4CXX_INFO(logger_, "ProcessMethodReturn"); + LOG4CXX_AUTO_TRACE(logger_); dbus_uint32_t reply_serial = dbus_message_get_reply_serial(msg); std::pair<uint, MessageId> ids = GetRequestToHMI(reply_serial); if (ids.second == hmi_apis::FunctionID::INVALID_ENUM) { @@ -675,7 +675,7 @@ bool DBusAdapter::GetHeader(DBusMessageIter* iter, int* code, bool DBusAdapter::GetArguments(DBusMessageIter* iter, const ListArgs& rules, smart_objects::SmartObject& args) { - LOG4CXX_TRACE(logger_, "GetArguments"); + LOG4CXX_AUTO_TRACE(logger_); size_t size = rules.size(); for (size_t i = 0; i < size; ++i) { diff --git a/src/components/hmi_message_handler/src/dbus_message_adapter.cc b/src/components/hmi_message_handler/src/dbus_message_adapter.cc index 7c540ad0c2..8dcdc9c1fe 100644 --- a/src/components/hmi_message_handler/src/dbus_message_adapter.cc +++ b/src/components/hmi_message_handler/src/dbus_message_adapter.cc @@ -172,7 +172,7 @@ void DBusMessageAdapter::SendMessageToCore(const smart_objects::SmartObject& obj } void DBusMessageAdapter::Request(const smart_objects::SmartObject& obj) { - LOG4CXX_DEBUG(logger_, "Request"); + LOG4CXX_AUTO_TRACE(logger_); dbus::MessageId func_id = static_cast<dbus::MessageId>( obj[sos::S_PARAMS][sos::S_FUNCTION_ID].asInt()); dbus::MessageName name = get_schema().getMessageName(func_id); @@ -181,7 +181,7 @@ void DBusMessageAdapter::Request(const smart_objects::SmartObject& obj) { } void DBusMessageAdapter::Notification(const smart_objects::SmartObject &obj) { - LOG4CXX_DEBUG(logger_, "Notification"); + LOG4CXX_AUTO_TRACE(logger_); dbus::MessageId func_id = static_cast<dbus::MessageId>( obj[sos::S_PARAMS][sos::S_FUNCTION_ID].asInt()); dbus::MessageName name = get_schema().getMessageName(func_id); @@ -189,7 +189,7 @@ void DBusMessageAdapter::Notification(const smart_objects::SmartObject &obj) { } void DBusMessageAdapter::Response(const smart_objects::SmartObject& obj) { - LOG4CXX_DEBUG(logger_, "Response"); + LOG4CXX_AUTO_TRACE(logger_); dbus::MessageId func_id = static_cast<dbus::MessageId>( obj[sos::S_PARAMS][sos::S_FUNCTION_ID].asInt()); dbus::MessageName name = get_schema().getMessageName(func_id); diff --git a/src/components/hmi_message_handler/src/hmi_message_handler_impl.cc b/src/components/hmi_message_handler/src/hmi_message_handler_impl.cc index 887d145617..1a19610790 100644 --- a/src/components/hmi_message_handler/src/hmi_message_handler_impl.cc +++ b/src/components/hmi_message_handler/src/hmi_message_handler_impl.cc @@ -59,7 +59,7 @@ HMIMessageHandlerImpl::~HMIMessageHandlerImpl() { } void HMIMessageHandlerImpl::OnMessageReceived(MessageSharedPointer message) { - LOG4CXX_INFO(logger_, "HMIMessageHandlerImpl::OnMessageReceived()"); + LOG4CXX_AUTO_TRACE(logger_); sync_primitives::AutoLock lock(observer_locker_); if (!observer_) { LOG4CXX_WARN(logger_, "No HMI message observer set!"); @@ -79,7 +79,7 @@ void HMIMessageHandlerImpl::set_message_observer(HMIMessageObserver* observer) { } void HMIMessageHandlerImpl::OnErrorSending(MessageSharedPointer message) { - LOG4CXX_INFO(logger_, "HMIMessageHandlerImpl::OnErrorSending()"); + LOG4CXX_AUTO_TRACE(logger_); sync_primitives::AutoLock lock(observer_locker_); if (!observer_) { LOG4CXX_WARN(logger_, "No HMI message observer set!"); @@ -89,13 +89,13 @@ void HMIMessageHandlerImpl::OnErrorSending(MessageSharedPointer message) { } void HMIMessageHandlerImpl::AddHMIMessageAdapter(HMIMessageAdapter* adapter) { - LOG4CXX_INFO(logger_, "HMIMessageHandlerImpl::AddHMIMessageAdapter()"); + LOG4CXX_AUTO_TRACE(logger_); message_adapters_.insert(adapter); } void HMIMessageHandlerImpl::RemoveHMIMessageAdapter( HMIMessageAdapter* adapter) { - LOG4CXX_INFO(logger_, "HMIMessageHandlerImpl::RemoveHMIMessageAdapter()"); + LOG4CXX_AUTO_TRACE(logger_); if (adapter != NULL) { message_adapters_.erase(adapter); } diff --git a/src/components/media_manager/src/audio/audio_stream_sender_thread.cc b/src/components/media_manager/src/audio/audio_stream_sender_thread.cc index a78ca8b49c..dbf9f55175 100644 --- a/src/components/media_manager/src/audio/audio_stream_sender_thread.cc +++ b/src/components/media_manager/src/audio/audio_stream_sender_thread.cc @@ -93,23 +93,23 @@ void AudioStreamSenderThread::sendAudioChunkToMobile() { std::vector<uint8_t>::iterator to; if (!file_system::ReadBinaryFile(fileName_, binaryData)) { - LOG4CXX_ERROR_EXT(logger_, "Unable to read file." << fileName_); + LOG4CXX_ERROR(logger_, "Unable to read file." << fileName_); return; } if (binaryData.empty()) { - LOG4CXX_ERROR_EXT(logger_, "Binary data is empty."); + LOG4CXX_ERROR(logger_, "Binary data is empty."); return; } - LOG4CXX_INFO_EXT(logger_, "offset = " << offset_); + LOG4CXX_INFO(logger_, "offset = " << offset_); from = binaryData.begin() + offset_; to = binaryData.end(); if (from < binaryData.end() /*from != binaryData.end()*/) { - LOG4CXX_INFO_EXT(logger_, "from != binaryData.end()"); + LOG4CXX_INFO(logger_, "from != binaryData.end()"); offset_ = offset_ + to - from; std::vector<uint8_t> data(from, to); diff --git a/src/components/media_manager/src/socket_streamer_adapter.cc b/src/components/media_manager/src/socket_streamer_adapter.cc index 45b1f63a17..4c3d56f8d2 100644 --- a/src/components/media_manager/src/socket_streamer_adapter.cc +++ b/src/components/media_manager/src/socket_streamer_adapter.cc @@ -213,14 +213,14 @@ void SocketStreamerAdapter::Streamer::start() { server_->socket_fd_ = socket(AF_INET, SOCK_STREAM, 0); if (0 >= server_->socket_fd_) { - LOG4CXX_ERROR_EXT(logger, "Server open error"); + LOG4CXX_ERROR(logger, "Server open error"); return; } int32_t optval = 1; if (-1 == setsockopt(server_->socket_fd_, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof optval)) { - LOG4CXX_ERROR_EXT(logger, "Unable to set sockopt"); + LOG4CXX_ERROR(logger, "Unable to set sockopt"); return; } @@ -232,13 +232,13 @@ void SocketStreamerAdapter::Streamer::start() { if (-1 == bind(server_->socket_fd_, reinterpret_cast<struct sockaddr*>(&serv_addr_), sizeof(serv_addr_))) { - LOG4CXX_ERROR_EXT(logger, "Unable to bind"); + LOG4CXX_ERROR(logger, "Unable to bind"); return; } LOG4CXX_INFO(logger, "SocketStreamerAdapter::listen for connections"); if (-1 == listen(server_->socket_fd_, 5)) { - LOG4CXX_ERROR_EXT(logger, "Unable to listen"); + LOG4CXX_ERROR(logger, "Unable to listen"); return; } } @@ -271,10 +271,10 @@ bool SocketStreamerAdapter::Streamer::is_ready() const { retval = select(new_socket_fd_ + 1, 0, &fds, 0, &tv); if (-1 == retval) { - LOG4CXX_ERROR_EXT(logger, "An error occurred"); + LOG4CXX_ERROR(logger, "An error occurred"); result = false; } else if (0 == retval) { - LOG4CXX_ERROR_EXT(logger, "The timeout expired"); + LOG4CXX_ERROR(logger, "The timeout expired"); result = false; } return result; @@ -283,7 +283,7 @@ bool SocketStreamerAdapter::Streamer::is_ready() const { bool SocketStreamerAdapter::Streamer::send( const ::protocol_handler::RawMessagePtr msg) { if (!is_ready()) { - LOG4CXX_ERROR_EXT(logger, " Socket is not ready"); + LOG4CXX_ERROR(logger, " Socket is not ready"); return false; } @@ -297,14 +297,14 @@ bool SocketStreamerAdapter::Streamer::send( }; if (-1 == ::send(new_socket_fd_, hdr, strlen(hdr), MSG_NOSIGNAL)) { - LOG4CXX_ERROR_EXT(logger, " Unable to send"); + LOG4CXX_ERROR(logger, " Unable to send"); return false; } } if (-1 == ::send(new_socket_fd_, (*msg).data(), (*msg).data_size(), MSG_NOSIGNAL)) { - LOG4CXX_ERROR_EXT(logger, " Unable to send"); + LOG4CXX_ERROR(logger, " Unable to send"); return false; } diff --git a/src/components/media_manager/src/streamer_listener.cc b/src/components/media_manager/src/streamer_listener.cc index 3181ba8e09..a5367a0d5d 100644 --- a/src/components/media_manager/src/streamer_listener.cc +++ b/src/components/media_manager/src/streamer_listener.cc @@ -55,7 +55,7 @@ void StreamerListener::OnDataReceived( void StreamerListener::OnErrorReceived( int32_t application_key, const DataForListener& data) { - LOG4CXX_ERROR(logger_, "StreamerListener::OnErrorReceived"); + LOG4CXX_AUTO_TRACE(logger_); } void StreamerListener::OnActivityStarted(int32_t application_key) { diff --git a/src/components/media_manager/src/video/video_stream_to_file_adapter.cc b/src/components/media_manager/src/video/video_stream_to_file_adapter.cc index 33b0c43ee5..8ca547ed10 100644 --- a/src/components/media_manager/src/video/video_stream_to_file_adapter.cc +++ b/src/components/media_manager/src/video/video_stream_to_file_adapter.cc @@ -139,7 +139,7 @@ VideoStreamToFileAdapter::Streamer::~Streamer() { } void VideoStreamToFileAdapter::Streamer::threadMain() { - LOG4CXX_INFO(logger, "Streamer::threadMain"); + LOG4CXX_AUTO_TRACE(logger); open(); @@ -173,7 +173,7 @@ void VideoStreamToFileAdapter::Streamer::threadMain() { } void VideoStreamToFileAdapter::Streamer::exitThreadMain() { - LOG4CXX_INFO(logger, "Streamer::exitThreadMain"); + LOG4CXX_AUTO_TRACE(logger); stop_flag_ = true; server_->messages_.Shutdown(); } diff --git a/src/components/policy/src/policy/src/cache_manager.cc b/src/components/policy/src/policy/src/cache_manager.cc index c0c69589c2..55de8ccfda 100644 --- a/src/components/policy/src/policy/src/cache_manager.cc +++ b/src/components/policy/src/policy/src/cache_manager.cc @@ -727,7 +727,7 @@ void CacheManager::PersistData() { } void CacheManager::ResetCalculatedPermissions() { - LOG4CXX_TRACE(logger_, "ResetCalculatedPermissions"); + LOG4CXX_AUTO_TRACE(logger_); sync_primitives::AutoLock lock(calculated_permissions_lock_); calculated_permissions_.clear(); } diff --git a/src/components/policy/src/policy/src/policy_manager_impl.cc b/src/components/policy/src/policy/src/policy_manager_impl.cc index 89409b8929..018095d343 100644 --- a/src/components/policy/src/policy/src/policy_manager_impl.cc +++ b/src/components/policy/src/policy/src/policy_manager_impl.cc @@ -369,7 +369,7 @@ void PolicyManagerImpl::SendNotificationOnPermissionsUpdated( } bool PolicyManagerImpl::CleanupUnpairedDevices() { - LOG4CXX_INFO(logger_, "CleanupUnpairedDevices"); + LOG4CXX_AUTO_TRACE(logger_); // For SDL-specific it doesn't matter return true; } @@ -382,7 +382,7 @@ DeviceConsent PolicyManagerImpl::GetUserConsentForDevice( void PolicyManagerImpl::SetUserConsentForDevice(const std::string& device_id, bool is_allowed) { - LOG4CXX_INFO(logger_, "SetUserConsentForDevice"); + LOG4CXX_AUTO_TRACE(logger_); LOG4CXX_DEBUG(logger_, "Device :" << device_id); DeviceConsent current_consent = GetUserConsentForDevice(device_id); bool is_current_device_allowed = @@ -403,7 +403,7 @@ bool PolicyManagerImpl::ReactOnUserDevConsentForApp(const std::string app_id, bool PolicyManagerImpl::GetInitialAppData(const std::string& application_id, StringArray* nicknames, StringArray* app_hmi_types) { - LOG4CXX_INFO(logger_, "GetInitialAppData"); + LOG4CXX_AUTO_TRACE(logger_); const bool result = nicknames && app_hmi_types; if (result) { cache_->GetInitialAppData(application_id, *nicknames, *app_hmi_types); @@ -419,7 +419,7 @@ void PolicyManagerImpl::AddDevice(const std::string& device_id, void PolicyManagerImpl::SetDeviceInfo(const std::string& device_id, const DeviceInfo& device_info) { - LOG4CXX_INFO(logger_, "SetDeviceInfo"); + LOG4CXX_AUTO_TRACE(logger_); LOG4CXX_DEBUG(logger_, "Device :" << device_id); } @@ -460,7 +460,7 @@ PermissionConsent PolicyManagerImpl::EnsureCorrectPermissionConsent( void PolicyManagerImpl::CheckPendingPermissionsChanges( const std::string& policy_app_id, const std::vector<FunctionalGroupPermission>& current_permissions) { - LOG4CXX_INFO(logger_, "CheckPendingPermissionsChanges"); + LOG4CXX_AUTO_TRACE(logger_); sync_primitives::AutoLock lock(app_permissions_diff_lock_); std::map<std::string, AppPermissions>::iterator it_pending = app_permissions_diff_.find(policy_app_id); @@ -501,18 +501,18 @@ void PolicyManagerImpl::CheckPendingPermissionsChanges( void PolicyManagerImpl::SetUserConsentForApp( const PermissionConsent& permissions) { - LOG4CXX_INFO(logger_, "SetUserConsentForApp"); + LOG4CXX_AUTO_TRACE(logger_); } bool PolicyManagerImpl::GetDefaultHmi(const std::string& policy_app_id, std::string* default_hmi) { - LOG4CXX_INFO(logger_, "GetDefaultHmi"); + LOG4CXX_AUTO_TRACE(logger_); return false; } bool PolicyManagerImpl::GetPriority(const std::string& policy_app_id, std::string* priority) { - LOG4CXX_INFO(logger_, "GetPriority"); + LOG4CXX_AUTO_TRACE(logger_); if (!priority) { LOG4CXX_WARN(logger_, "Input priority parameter is null."); return false; @@ -529,7 +529,7 @@ std::vector<UserFriendlyMessage> PolicyManagerImpl::GetUserFriendlyMessages( void PolicyManagerImpl::GetUserConsentForApp( const std::string& device_id, const std::string& policy_app_id, std::vector<FunctionalGroupPermission>& permissions) { - LOG4CXX_INFO(logger_, "GetUserConsentForApp"); + LOG4CXX_AUTO_TRACE(logger_); FunctionalIdType group_types; if (!cache_->GetPermissionsForApp(device_id, policy_app_id, @@ -577,7 +577,7 @@ void PolicyManagerImpl::GetUserConsentForApp( void PolicyManagerImpl::GetPermissionsForApp( const std::string& device_id, const std::string& policy_app_id, std::vector<FunctionalGroupPermission>& permissions) { - LOG4CXX_INFO(logger_, "GetPermissionsForApp"); + LOG4CXX_AUTO_TRACE(logger_); std::string app_id_to_check = policy_app_id; bool allowed_by_default = false; @@ -645,7 +645,7 @@ void PolicyManagerImpl::SetSystemLanguage(const std::string& language) { void PolicyManagerImpl::SetSystemInfo(const std::string& ccpu_version, const std::string& wers_country_code, const std::string& language) { - LOG4CXX_INFO(logger_, "SetSystemInfo"); + LOG4CXX_AUTO_TRACE(logger_); } void PolicyManagerImpl::OnSystemReady() { @@ -658,7 +658,7 @@ void PolicyManagerImpl::OnSystemReady() { uint32_t PolicyManagerImpl::GetNotificationsNumber( const std::string& priority) { - LOG4CXX_INFO(logger_, "GetNotificationsNumber"); + LOG4CXX_AUTO_TRACE(logger_); return cache_->GetNotificationsNumber(priority); } @@ -760,7 +760,7 @@ void PolicyManagerImpl::OnUpdateStarted() { } void PolicyManagerImpl::PTUpdatedAt(int kilometers, int days_after_epoch) { - LOG4CXX_INFO(logger_, "PTUpdatedAt"); + LOG4CXX_AUTO_TRACE(logger_); LOG4CXX_INFO(logger_, "Kilometers: " << kilometers << " Days: " << days_after_epoch); cache_->SetCountersPassedForSuccessfulUpdate( @@ -843,7 +843,7 @@ void PolicyManagerImpl::OnAppRegisteredOnMobile( } void PolicyManagerImpl::AddApplication(const std::string& application_id) { - LOG4CXX_INFO(logger_, "AddApplication"); + LOG4CXX_AUTO_TRACE(logger_); const std::string device_id = GetCurrentDeviceId(application_id); DeviceConsent device_consent = GetUserConsentForDevice(device_id); sync_primitives::AutoLock lock(apps_registration_lock_); diff --git a/src/components/policy/src/policy/src/sql_pt_ext_representation.cc b/src/components/policy/src/policy/src/sql_pt_ext_representation.cc index 0a8b3036ef..c413c654c9 100644 --- a/src/components/policy/src/policy/src/sql_pt_ext_representation.cc +++ b/src/components/policy/src/policy/src/sql_pt_ext_representation.cc @@ -85,7 +85,7 @@ bool SQLPTExtRepresentation::ResetAppConsents() { bool SQLPTExtRepresentation::GetUserPermissionsForDevice( const std::string& device_id, StringArray* consented_groups, StringArray* disallowed_groups) { - LOG4CXX_INFO(logger_, "GetUserPermissionsForDevice"); + LOG4CXX_AUTO_TRACE(logger_); utils::dbms::SQLQuery query(db()); if (!query.Prepare(sql_pt_ext::kSelectDeviceConsentedGroup)) { LOG4CXX_WARN(logger_, "Incorrect select from device consented groups"); @@ -112,7 +112,7 @@ bool SQLPTExtRepresentation::GetUserPermissionsForDevice( bool SQLPTExtRepresentation::GetPermissionsForApp( const std::string& device_id, const std::string& policy_app_id, FunctionalIdType* group_types) { - LOG4CXX_INFO(logger_, "GetPermissionsForApp"); + LOG4CXX_AUTO_TRACE(logger_); if (!group_types) { LOG4CXX_WARN(logger_, "Input parameter for group types is null."); return false; @@ -165,7 +165,7 @@ bool SQLPTExtRepresentation::GetPermissionsForApp( bool SQLPTExtRepresentation::GetDeviceGroupsFromPolicies( policy_table::Strings* groups, policy_table::Strings* preconsented_groups) { - LOG4CXX_INFO(logger_, "GetDeviceGroupsFromPolicies"); + LOG4CXX_AUTO_TRACE(logger_); if (groups) { GatherAppGroup(kDeviceId, groups); } @@ -183,7 +183,7 @@ bool SQLPTExtRepresentation::SetDeviceData(const std::string& device_id, const std::string& carrier, const uint32_t number_of_ports, const std::string& connection_type) { - LOG4CXX_INFO(logger_, "SetDeviceData"); + LOG4CXX_AUTO_TRACE(logger_); utils::dbms::SQLQuery count_query(db()); if (!count_query.Prepare(sql_pt_ext::kCountDevice)) { LOG4CXX_WARN(logger_, "Incorrect statement for count of device."); @@ -253,7 +253,7 @@ bool SQLPTExtRepresentation::SetDeviceData(const std::string& device_id, bool SQLPTExtRepresentation::SetUserPermissionsForDevice( const std::string& device_id, const StringArray& consented_groups, const StringArray& disallowed_groups) { - LOG4CXX_TRACE(logger_, "SetUserPermissionsForDevice"); + LOG4CXX_AUTO_TRACE(logger_); utils::dbms::SQLQuery count_query(db()); if (!count_query.Prepare(sql_pt_ext::kCountDeviceConsentGroup)) { LOG4CXX_WARN(logger_, "Incorrect count of device consented groups"); @@ -393,7 +393,7 @@ bool SQLPTExtRepresentation::ReactOnUserDevConsentForApp( bool SQLPTExtRepresentation::SetUserPermissionsForApp( const PermissionConsent& permissions) { - LOG4CXX_INFO(logger_, "SetUserPermissionsForApp"); + LOG4CXX_AUTO_TRACE(logger_); // TODO(AOleynik): Handle situation, when no application was specified, i.e. // general permissions were set std::vector<FunctionalGroupPermission>::const_iterator it = permissions @@ -581,7 +581,7 @@ bool SQLPTExtRepresentation::SetMetaInfo(const std::string& ccpu_version, } bool SQLPTExtRepresentation::IsMetaInfoPresent() { - LOG4CXX_INFO(logger_, "IsMetaInfoPresent"); + LOG4CXX_AUTO_TRACE(logger_); utils::dbms::SQLQuery query(db()); if (!query.Prepare(sql_pt_ext::kSelectMetaParams)) { LOG4CXX_WARN(logger_, "Incorrect statement for selecting meta info."); @@ -597,7 +597,7 @@ bool SQLPTExtRepresentation::IsMetaInfoPresent() { } bool SQLPTExtRepresentation::SetSystemLanguage(const std::string& language) { - LOG4CXX_INFO(logger_, "SetSystemLanguage"); + LOG4CXX_AUTO_TRACE(logger_); utils::dbms::SQLQuery query(db()); if (!query.Prepare(sql_pt_ext::kUpdateMetaLanguage)) { LOG4CXX_WARN(logger_, "Incorrect statement for update meta language."); @@ -991,7 +991,7 @@ void SQLPTExtRepresentation::GatherConsentGroup( bool SQLPTExtRepresentation::SaveDeviceData( const policy_table::DeviceData& devices) { - LOG4CXX_INFO(logger_, "SaveDeviceData"); + LOG4CXX_AUTO_TRACE(logger_); utils::dbms::SQLQuery drop_device_query(db()); const std::string drop_device = "DELETE FROM `device`"; if (!drop_device_query.Exec(drop_device)) { @@ -1048,7 +1048,7 @@ const policy_table::DeviceData& devices) { bool SQLPTExtRepresentation::SaveConsentGroup( const std::string& device_id, const policy_table::UserConsentRecords& records) { - LOG4CXX_INFO(logger_, "SaveConsentGroup"); + LOG4CXX_AUTO_TRACE(logger_); utils::dbms::SQLQuery query(db()); policy_table::UserConsentRecords::const_iterator it = records.begin(); @@ -1109,7 +1109,7 @@ bool SQLPTExtRepresentation::SaveConsentGroup( bool SQLPTExtRepresentation::SavePreconsentedGroup( const std::string& app_id, const policy_table::Strings& groups) { - LOG4CXX_INFO(logger_, "SavePreconsentedGroup"); + LOG4CXX_AUTO_TRACE(logger_); utils::dbms::SQLQuery query(db()); if (!query.Prepare(sql_pt_ext::kInsertPreconsentedGroups)) { LOG4CXX_WARN(logger_, @@ -1190,7 +1190,7 @@ bool SQLPTExtRepresentation::GetConsentedGroups( const std::string& policy_app_id, const std::string& device_id, FunctionalGroupIDs& allowed_groups, FunctionalGroupIDs& disallowed_groups) { - LOG4CXX_INFO(logger_, "GetConsentedGroups"); + LOG4CXX_AUTO_TRACE(logger_); utils::dbms::SQLQuery query(db()); if (!query.Prepare(sql_pt_ext::kSelectConsentedGroupsId)) { LOG4CXX_WARN(logger_, "Incorrect statement for select consent groups id."); @@ -1213,7 +1213,7 @@ bool SQLPTExtRepresentation::GetConsentedGroups( bool SQLPTExtRepresentation::GetPreconsentedGroups( const std::string& policy_app_id, FunctionalGroupIDs& preconsented_groups) { - LOG4CXX_INFO(logger_, "GetPreconsentedGroups"); + LOG4CXX_AUTO_TRACE(logger_); utils::dbms::SQLQuery query(db()); if (!query.Prepare(sql_pt_ext::kSelectPreconsentedGroupsId)) { LOG4CXX_WARN(logger_, @@ -1232,7 +1232,7 @@ bool SQLPTExtRepresentation::GetPreconsentedGroups( bool SQLPTExtRepresentation::GetFunctionalGroupNames( FunctionalGroupNames& names) { - LOG4CXX_INFO(logger_, "GetFunctionalGroupNames"); + LOG4CXX_AUTO_TRACE(logger_); utils::dbms::SQLQuery query(db()); if (!query.Prepare(sql_pt_ext::kSelectFunctionalGroupNames)) { LOG4CXX_WARN(logger_, @@ -1345,7 +1345,7 @@ void SQLPTExtRepresentation::Add(const std::string& app_id, bool SQLPTExtRepresentation::GetDefaultHMI(const std::string& policy_app_id, std::string* default_hmi) { - LOG4CXX_INFO(logger_, "GetDefaultHMI"); + LOG4CXX_AUTO_TRACE(logger_); utils::dbms::SQLQuery query(db()); if (!query.Prepare(sql_pt_ext::kSelectDefaultHmi)) { LOG4CXX_INFO(logger_, "Incorrect statement for default hmi."); @@ -1373,7 +1373,7 @@ bool SQLPTExtRepresentation::CountUnconsentedGroups( const std::string& policy_app_id, const std::string& device_id, int* result) const { - LOG4CXX_INFO(logger_, "CountUnconsentedGroups"); + LOG4CXX_AUTO_TRACE(logger_); utils::dbms::SQLQuery query(db()); if (!query.Prepare(sql_pt_ext::kCountUnconsentedGroups)) { LOG4CXX_WARN(logger_, "Incorrect select for unconsented groups."); @@ -1527,7 +1527,7 @@ bool SQLPTExtRepresentation::SaveGlobalCounters( bool SQLPTExtRepresentation::CleanupUnpairedDevices( const DeviceIds& device_ids) const { - LOG4CXX_INFO(logger_, "CleanupUnpairedDevices"); + LOG4CXX_AUTO_TRACE(logger_); utils::dbms::SQLQuery delete_device_query(db()); if (!delete_device_query.Prepare(sql_pt::kDeleteDevice)) { LOG4CXX_WARN(logger_, "Incorrect statement for device delete."); diff --git a/src/components/policy/src/policy/src/sql_pt_representation.cc b/src/components/policy/src/policy/src/sql_pt_representation.cc index 48eab10175..c53f80adf9 100644 --- a/src/components/policy/src/policy/src/sql_pt_representation.cc +++ b/src/components/policy/src/policy/src/sql_pt_representation.cc @@ -271,7 +271,7 @@ std::string SQLPTRepresentation::GetLockScreenIconUrl() const { int SQLPTRepresentation::GetNotificationsNumber(const std::string& priority) { - LOG4CXX_INFO(logger_, "GetNotificationsNumber"); + LOG4CXX_AUTO_TRACE(logger_); utils::dbms::SQLQuery query(db()); if (!query.Prepare(sql_pt::kSelectNotificationsPerPriority)) { LOG4CXX_WARN(logger_, "Incorrect select statement for priority " @@ -293,7 +293,7 @@ int SQLPTRepresentation::GetNotificationsNumber(const std::string& priority) { bool SQLPTRepresentation::GetPriority(const std::string& policy_app_id, std::string* priority) { - LOG4CXX_INFO(logger_, "GetPriority"); + LOG4CXX_AUTO_TRACE(logger_); if (NULL == priority) { LOG4CXX_WARN(logger_, "Input priority parameter is null."); return false; @@ -473,7 +473,7 @@ bool SQLPTRepresentation::RefreshDB() { utils::SharedPtr<policy_table::Table> SQLPTRepresentation::GenerateSnapshot() const { - LOG4CXX_INFO(logger_, "GenerateSnapshot"); + LOG4CXX_AUTO_TRACE(logger_); utils::SharedPtr<policy_table::Table> table = new policy_table::Table(); GatherModuleMeta(&*table->policy_table.module_meta); GatherModuleConfig(&table->policy_table.module_config); @@ -1301,7 +1301,7 @@ void SQLPTRepresentation::IncrementIgnitionCycles() { } void SQLPTRepresentation::ResetIgnitionCycles() { - LOG4CXX_INFO(logger_, "ResetIgnitionCycles"); + LOG4CXX_AUTO_TRACE(logger_); utils::dbms::SQLQuery query(db()); if (!query.Exec(sql_pt::kResetIgnitionCycles)) { LOG4CXX_WARN(logger_, "Failed to reset ignition cycles number."); @@ -1363,7 +1363,7 @@ bool SQLPTRepresentation::GetInitialAppData(const std::string& app_id, bool SQLPTRepresentation::GetFunctionalGroupings( policy_table::FunctionalGroupings& groups) { - LOG4CXX_INFO(logger_, "GetFunctionalGroupings"); + LOG4CXX_AUTO_TRACE(logger_); return GatherFunctionalGroupings(&groups); } diff --git a/src/components/policy/src/policy/src/update_status_manager.cc b/src/components/policy/src/policy/src/update_status_manager.cc index e5cc74a315..86a4cabeae 100644 --- a/src/components/policy/src/policy/src/update_status_manager.cc +++ b/src/components/policy/src/policy/src/update_status_manager.cc @@ -65,7 +65,7 @@ void UpdateStatusManager::set_listener(PolicyListener* listener) { } void UpdateStatusManager::OnUpdateSentOut(uint32_t update_timeout) { - LOG4CXX_INFO(logger_, "OnUpdateSentOut"); + LOG4CXX_AUTO_TRACE(logger_); DCHECK(update_status_thread_delegate_); const unsigned milliseconds_in_second = 1000; update_status_thread_delegate_->updateTimeOut(update_timeout * @@ -76,7 +76,7 @@ void UpdateStatusManager::OnUpdateSentOut(uint32_t update_timeout) { } void UpdateStatusManager::OnUpdateTimeoutOccurs() { - LOG4CXX_INFO(logger_, "OnUpdateTimeoutOccurs"); + LOG4CXX_AUTO_TRACE(logger_); set_update_required(true); set_exchange_in_progress(false); set_exchange_pending(false); @@ -85,21 +85,21 @@ void UpdateStatusManager::OnUpdateTimeoutOccurs() { } void UpdateStatusManager::OnValidUpdateReceived() { - LOG4CXX_INFO(logger_, "OnValidUpdateReceived"); + LOG4CXX_AUTO_TRACE(logger_); update_status_thread_delegate_->updateTimeOut(0); // Stop Timer set_exchange_pending(false); set_exchange_in_progress(false); } void UpdateStatusManager::OnWrongUpdateReceived() { - LOG4CXX_INFO(logger_, "OnWrongUpdateReceived"); + LOG4CXX_AUTO_TRACE(logger_); update_status_thread_delegate_->updateTimeOut(0); // Stop Timer set_update_required(true); set_exchange_in_progress(false); } void UpdateStatusManager::OnResetDefaultPT(bool is_update_required) { - LOG4CXX_INFO(logger_, "OnResetDefaultPT"); + LOG4CXX_AUTO_TRACE(logger_); exchange_in_progress_ = false; update_required_ = is_update_required; exchange_pending_ = false; @@ -107,7 +107,7 @@ void UpdateStatusManager::OnResetDefaultPT(bool is_update_required) { } void UpdateStatusManager::OnResetRetrySequence() { - LOG4CXX_INFO(logger_, "OnResetRetrySequence"); + LOG4CXX_AUTO_TRACE(logger_); if (exchange_in_progress_) { set_exchange_pending(true); } @@ -115,12 +115,12 @@ void UpdateStatusManager::OnResetRetrySequence() { } void UpdateStatusManager::OnNewApplicationAdded() { - LOG4CXX_INFO(logger_, "OnNewApplicationAdded"); + LOG4CXX_AUTO_TRACE(logger_); set_update_required(true); } void UpdateStatusManager::OnPolicyInit(bool is_update_required) { - LOG4CXX_INFO(logger_, "OnPolicyInit"); + LOG4CXX_AUTO_TRACE(logger_); update_required_ = is_update_required; } diff --git a/src/components/protocol_handler/src/protocol_handler_impl.cc b/src/components/protocol_handler/src/protocol_handler_impl.cc index 5e69b1cdfd..a14097b61c 100644 --- a/src/components/protocol_handler/src/protocol_handler_impl.cc +++ b/src/components/protocol_handler/src/protocol_handler_impl.cc @@ -1026,7 +1026,7 @@ RESULT_CODE ProtocolHandlerImpl::HandleControlMessageStartSession( connection_id, packet.session_id(), service_type, protection, &hash_id); if (0 == session_id) { - LOG4CXX_WARN_EXT(logger_, "Refused to create service " << + LOG4CXX_WARN(logger_, "Refused to create service " << static_cast<int32_t>(service_type) << " type."); SendStartSessionNAck(connection_id, packet.session_id(), protocol_version, packet.service_type()); diff --git a/src/components/security_manager/src/security_manager_impl.cc b/src/components/security_manager/src/security_manager_impl.cc index dee1770e70..d985870046 100644 --- a/src/components/security_manager/src/security_manager_impl.cc +++ b/src/components/security_manager/src/security_manager_impl.cc @@ -222,7 +222,7 @@ void SecurityManagerImpl::RemoveListener(SecurityManagerListener *const listener } void SecurityManagerImpl::NotifyListenersOnHandshakeDone(const uint32_t &connection_key, const bool success) { - LOG4CXX_TRACE(logger_, "NotifyListenersOnHandshakeDone"); + LOG4CXX_AUTO_TRACE(logger_); std::list<SecurityManagerListener*>::iterator it = listeners_.begin(); while (it != listeners_.end()) { if ((*it)->OnHandshakeDone(connection_key, success)) { diff --git a/src/components/time_tester/src/time_manager.cc b/src/components/time_tester/src/time_manager.cc index db389dbda0..19a272bb32 100644 --- a/src/components/time_tester/src/time_manager.cc +++ b/src/components/time_tester/src/time_manager.cc @@ -146,7 +146,7 @@ void TimeManager::Streamer::Start() { server_socket_fd_ = socket(AF_INET, SOCK_STREAM, 0); if (0 >= server_socket_fd_) { - LOG4CXX_ERROR_EXT(logger_, "Server open error"); + LOG4CXX_ERROR(logger_, "Server open error"); return; } else { LOG4CXX_DEBUG(logger_, "Server socket : " << server_socket_fd_); @@ -155,7 +155,7 @@ void TimeManager::Streamer::Start() { int32_t optval = 1; if (-1 == setsockopt(server_socket_fd_, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof optval)) { - LOG4CXX_ERROR_EXT(logger_, "Unable to set sockopt"); + LOG4CXX_ERROR(logger_, "Unable to set sockopt"); return; } @@ -222,10 +222,10 @@ bool TimeManager::Streamer::IsReady() const { const int retval = select(client_socket_fd_ + 1, 0, &fds, 0, &tv); if (-1 == retval) { - LOG4CXX_ERROR_EXT(logger_, "An error occurred"); + LOG4CXX_ERROR(logger_, "An error occurred"); result = false; } else if (0 == retval) { - LOG4CXX_ERROR_EXT(logger_, "The timeout expired"); + LOG4CXX_ERROR(logger_, "The timeout expired"); result = false; } @@ -235,13 +235,13 @@ bool TimeManager::Streamer::IsReady() const { bool TimeManager::Streamer::Send(const std::string& msg) { LOG4CXX_AUTO_TRACE(logger_); if (!IsReady()) { - LOG4CXX_ERROR_EXT(logger_, " Socket is not ready"); + LOG4CXX_ERROR(logger_, " Socket is not ready"); return false; } if (-1 == ::send(client_socket_fd_, msg.c_str(), msg.size(), MSG_NOSIGNAL)) { - LOG4CXX_ERROR_EXT(logger_, " Unable to send"); + LOG4CXX_ERROR(logger_, " Unable to send"); return false; } return true; diff --git a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc index cb6c4b6018..0f66cc0396 100644 --- a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc +++ b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc @@ -479,7 +479,7 @@ bool TransportAdapterImpl::IsServerOriginatedConnectSupported() const { } bool TransportAdapterImpl::IsClientOriginatedConnectSupported() const { - LOG4CXX_TRACE(logger_, "IsClientOriginatedConnectSupported"); + LOG4CXX_AUTO_TRACE(logger_); return client_connection_listener_ != 0; } diff --git a/test/components/transport_manager/TransportManagerTestWithMultiThreadedClient.cpp b/test/components/transport_manager/TransportManagerTestWithMultiThreadedClient.cpp index f288878bf1..a25035b420 100644 --- a/test/components/transport_manager/TransportManagerTestWithMultiThreadedClient.cpp +++ b/test/components/transport_manager/TransportManagerTestWithMultiThreadedClient.cpp @@ -107,7 +107,7 @@ namespace test { namespace components { namespace TransportManager { namespace T void doScanForNewDevices() { - LOG4CXX_INFO_EXT(mLogger, "\n-------------- Scanning new devices -----------------"); + LOG4CXX_INFO(mLogger, "\n-------------- Scanning new devices -----------------"); SInternalDeviceInfo deviceInfo; deviceInfo.mDeviceHandle = Data::DeviceHandle; deviceInfo.mUniqueDeviceId = Data::UniqueDeviceId; @@ -116,13 +116,13 @@ namespace test { namespace components { namespace TransportManager { namespace T tInternalDeviceList list; list.push_back(deviceInfo); - LOG4CXX_INFO_EXT(mLogger, "\n-------------- Sending device list update -----------------"); + LOG4CXX_INFO(mLogger, "\n-------------- Sending device list update -----------------"); mListener.onDeviceListUpdated(this, list); } void doConnectDevice(const tDeviceHandle DeviceHandle) { - LOG4CXX_INFO_EXT(mLogger, "\n-------------- Connecting device -----------------"); + LOG4CXX_INFO(mLogger, "\n-------------- Connecting device -----------------"); // Application connect SDeviceInfo deviceInfo; @@ -130,33 +130,33 @@ namespace test { namespace components { namespace TransportManager { namespace T deviceInfo.mUniqueDeviceId = Data::UniqueDeviceId; deviceInfo.mUserFriendlyName = Data::UserFriendlyName; - LOG4CXX_INFO_EXT(mLogger, "\n-------------- Sending ApplicationConnected -----------------"); + LOG4CXX_INFO(mLogger, "\n-------------- Sending ApplicationConnected -----------------"); mListener.onApplicationConnected(this, deviceInfo, Data::ConnectionHandle); } void doSendFrame(tConnectionHandle ConnectionHandle, const uint8_t* Data, size_t DataSize, int UserData) { - LOG4CXX_INFO_EXT(mLogger, "\n-------------- doSendFrame called -----------------"); + LOG4CXX_INFO(mLogger, "\n-------------- doSendFrame called -----------------"); - LOG4CXX_INFO_EXT(mLogger, "\n-------------- Sending frame back to TransportManager. DataSize: " << DataSize << "--------------"); + LOG4CXX_INFO(mLogger, "\n-------------- Sending frame back to TransportManager. DataSize: " << DataSize << "--------------"); // Loop back. Each recevied frame is sent back. mListener.onFrameReceived(this, ConnectionHandle, Data, DataSize); - LOG4CXX_INFO_EXT(mLogger, "\n-------------- Calling onFrameSendCompleted. UserData: " << UserData << "--------------"); + LOG4CXX_INFO(mLogger, "\n-------------- Calling onFrameSendCompleted. UserData: " << UserData << "--------------"); mListener.onFrameSendCompleted(this, Data::ConnectionHandle, UserData, SendStatusOK); } void doDisconnectDevice(const tDeviceHandle DeviceHandle) { - LOG4CXX_INFO_EXT(mLogger, "\n-------------- doDisconnectDevice -----------------"); + LOG4CXX_INFO(mLogger, "\n-------------- doDisconnectDevice -----------------"); SDeviceInfo deviceInfo; deviceInfo.mDeviceHandle = Data::DeviceHandle; deviceInfo.mUniqueDeviceId = Data::UniqueDeviceId; deviceInfo.mUserFriendlyName = Data::UserFriendlyName; - LOG4CXX_INFO_EXT(mLogger, "\n-------------- sending ApplicationDisconnected -----------------"); + LOG4CXX_INFO(mLogger, "\n-------------- sending ApplicationDisconnected -----------------"); mListener.onApplicationDisconnected(this, deviceInfo, Data::ConnectionHandle); } @@ -200,7 +200,7 @@ namespace test { namespace components { namespace TransportManager { namespace T void doDeviceListUpdated(const tDeviceList& DeviceList) { - LOG4CXX_INFO_EXT(mLogger, "\n-------------- doDeviceListUpdated -----------------"); + LOG4CXX_INFO(mLogger, "\n-------------- doDeviceListUpdated -----------------"); mDeviceList = DeviceList; tDeviceList::const_iterator device; @@ -212,7 +212,7 @@ namespace test { namespace components { namespace TransportManager { namespace T void doApplicationConnected(const SDeviceInfo& ConnectedDevice, const tConnectionHandle Connection) { - LOG4CXX_INFO_EXT(mLogger, "\n-------------- doApplicationConnected -----------------"); + LOG4CXX_INFO(mLogger, "\n-------------- doApplicationConnected -----------------"); for (int i = 0; i < Data::NumberOfThreads; ++i) { @@ -224,7 +224,7 @@ namespace test { namespace components { namespace TransportManager { namespace T void doFrameSendCompleted(tConnectionHandle ConnectionHandle, int UserData, ESendStatus SendStatus) { - LOG4CXX_INFO_EXT(mLogger, "\n-------------- doFrameSendCompleted -----------------"); + LOG4CXX_INFO(mLogger, "\n-------------- doFrameSendCompleted -----------------"); pthread_mutex_lock(&mFrameSendCompletedMutex); @@ -237,13 +237,13 @@ namespace test { namespace components { namespace TransportManager { namespace T pthread_mutex_unlock(&mFrameSendCompletedMutex); - LOG4CXX_INFO_EXT(mLogger, "\n-------------- Number of completely sent frames: " + LOG4CXX_INFO(mLogger, "\n-------------- Number of completely sent frames: " << mNumberOfCompletelySentFrames << " -----------------"); } void doFrameReceived(tConnectionHandle ConnectionHandle, const uint8_t* Data, size_t DataSize) { - LOG4CXX_INFO_EXT(mLogger, "\n-------------- doFrameReceived -----------------"); + LOG4CXX_INFO(mLogger, "\n-------------- doFrameReceived -----------------"); pthread_mutex_lock(&mFrameReceivedNumberMutex); @@ -251,7 +251,7 @@ namespace test { namespace components { namespace TransportManager { namespace T pthread_mutex_unlock(&mFrameReceivedNumberMutex); - LOG4CXX_INFO_EXT(mLogger, "\n-------------- Number of received frames: " << mNumberOfReceivedFrames << " -----------------"); + LOG4CXX_INFO(mLogger, "\n-------------- Number of received frames: " << mNumberOfReceivedFrames << " -----------------"); } void disconnectAllDevices(void) @@ -303,7 +303,7 @@ namespace test { namespace components { namespace TransportManager { namespace T { MockTransportManagerClient *pTMClient = static_cast<MockTransportManagerClient*>(Data); - LOG4CXX_INFO_EXT(pTMClient->mLogger, "\n-------------- Frame Send Thread Started -----------------"); + LOG4CXX_INFO(pTMClient->mLogger, "\n-------------- Frame Send Thread Started -----------------"); for (int i = 0; i < Data::NumberOfFramesPerThread; ++i) { @@ -407,7 +407,7 @@ namespace test { namespace components { namespace TransportManager { namespace T ; addTransportAdapter(mpTransportAdapter); - LOG4CXX_INFO_EXT(mLogger, "Transport adapters initialized"); + LOG4CXX_INFO(mLogger, "Transport adapters initialized"); } protected: @@ -421,7 +421,7 @@ namespace test { namespace components { namespace TransportManager { namespace T { Logger logger = LOG4CXX::Logger::getInstance(LOG4CXX_TEXT("TransportManagerTest")); - LOG4CXX_INFO_EXT(logger, "\n*************************** Starting test *****************************"); + LOG4CXX_INFO(logger, "\n*************************** Starting test *****************************"); // All expectations must be sequenced //InSequence dummy; @@ -468,23 +468,23 @@ namespace test { namespace components { namespace TransportManager { namespace T pTm->addDataListener(&tmClient); pTm->addDeviceListener(&tmClient); - LOG4CXX_INFO_EXT(logger, "\n*************************** Calling RUN *****************************"); + LOG4CXX_INFO(logger, "\n*************************** Calling RUN *****************************"); pTm->run(); sleep(1); - LOG4CXX_INFO_EXT(logger, "\n*************************** Calling SCAN FOR DEVICES *****************************"); + LOG4CXX_INFO(logger, "\n*************************** Calling SCAN FOR DEVICES *****************************"); pTm->scanForNewDevices(); - LOG4CXX_INFO_EXT(logger, "\n******************* Waiting for all client thread to finish ********************"); + LOG4CXX_INFO(logger, "\n******************* Waiting for all client thread to finish ********************"); tmClient.waitForAllThreads(); - LOG4CXX_INFO_EXT(logger, "\n******************* Disconnecting all devices ********************"); + LOG4CXX_INFO(logger, "\n******************* Disconnecting all devices ********************"); tmClient.disconnectAllDevices(); sleep(1); - LOG4CXX_INFO_EXT(logger, "\n*************************** Deleting TM and shutting down *****************************"); + LOG4CXX_INFO(logger, "\n*************************** Deleting TM and shutting down *****************************"); // Shutdown transport manager delete pTm; |