diff options
Diffstat (limited to 'src/components/application_manager/src/request_info.cc')
-rw-r--r-- | src/components/application_manager/src/request_info.cc | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/src/components/application_manager/src/request_info.cc b/src/components/application_manager/src/request_info.cc index b6f53b6085..1149c9aaf9 100644 --- a/src/components/application_manager/src/request_info.cc +++ b/src/components/application_manager/src/request_info.cc @@ -40,7 +40,7 @@ namespace application_manager { namespace request_controller { -CREATE_LOGGERPTR_GLOBAL(logger_, "RequestController") +SDL_CREATE_LOG_VARIABLE("RequestController") uint32_t RequestInfo::HmiConnectionKey = 0; @@ -127,10 +127,9 @@ RequestInfoSet::~RequestInfoSet() { bool RequestInfoSet::Add(RequestInfoPtr request_info) { DCHECK_OR_RETURN(request_info, false); - LOG4CXX_DEBUG( - logger_, - "Add request app_id = " << request_info->app_id() - << "; corr_id = " << request_info->requestId()); + SDL_LOG_DEBUG("Add request app_id = " << request_info->app_id() + << "; corr_id = " + << request_info->requestId()); sync_primitives::AutoLock lock(pending_requests_lock_); CheckSetSizes(); const std::pair<HashSortedRequestInfoSet::iterator, bool>& insert_resilt = @@ -145,10 +144,9 @@ bool RequestInfoSet::Add(RequestInfoPtr request_info) { CheckSetSizes(); return true; } else { - LOG4CXX_ERROR(logger_, - "Request with app_id = " - << request_info->app_id() << "; corr_id " - << request_info->requestId() << " Already exist "); + SDL_LOG_ERROR("Request with app_id = " + << request_info->app_id() << "; corr_id " + << request_info->requestId() << " Already exist "); } CheckSetSizes(); return false; @@ -183,7 +181,7 @@ RequestInfoPtr RequestInfoSet::Front() { } RequestInfoPtr RequestInfoSet::FrontWithNotNullTimeout() { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); sync_primitives::AutoLock lock(pending_requests_lock_); RequestInfoPtr result; TimeSortedRequestInfoSet::iterator it = time_sorted_pending_requests_.begin(); @@ -202,7 +200,7 @@ RequestInfoPtr RequestInfoSet::FrontWithNotNullTimeout() { bool RequestInfoSet::Erase(const RequestInfoPtr request_info) { DCHECK(request_info); if (!request_info) { - LOG4CXX_ERROR(logger_, "NULL ponter request_info"); + SDL_LOG_ERROR("NULL ponter request_info"); return false; } CheckSetSizes(); @@ -214,7 +212,7 @@ bool RequestInfoSet::Erase(const RequestInfoPtr request_info) { time_sorted_pending_requests_.find(request_info); DCHECK(it != time_sorted_pending_requests_.end()); if (it == time_sorted_pending_requests_.end()) { - LOG4CXX_ERROR(logger_, "Can't find request in time_sorted_requests_"); + SDL_LOG_ERROR("Can't find request in time_sorted_requests_"); return false; } const RequestInfoPtr found = *it; @@ -234,7 +232,7 @@ bool RequestInfoSet::RemoveRequest(const RequestInfoPtr request_info) { uint32_t RequestInfoSet::RemoveRequests( const RequestInfoSet::AppIdCompararator& filter) { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); uint32_t erased = 0; sync_primitives::AutoLock lock(pending_requests_lock_); @@ -253,13 +251,13 @@ uint32_t RequestInfoSet::RemoveRequests( } uint32_t RequestInfoSet::RemoveByConnectionKey(uint32_t connection_key) { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); return RemoveRequests( AppIdCompararator(AppIdCompararator::Equal, connection_key)); } uint32_t RequestInfoSet::RemoveMobileRequests() { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); return RemoveRequests(AppIdCompararator(AppIdCompararator::NotEqual, RequestInfo::HmiConnectionKey)); } |