1 files changed, 14 insertions, 20 deletions
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_cache_impl.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_cache_impl.cc
index 3e50818210..ab33fde764 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_cache_impl.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_cache_impl.cc
@@ -41,7 +41,7 @@
 
 namespace rc_rpc_plugin {
 
-CREATE_LOGGERPTR_GLOBAL(logger_, "RemoteControlModule");
+SDL_CREATE_LOG_VARIABLE("RemoteControlModule");
 
 InteriorDataCacheImpl::InteriorDataCacheImpl() {}
 
@@ -49,9 +49,8 @@ InteriorDataCacheImpl::~InteriorDataCacheImpl() {}
 
 void InteriorDataCacheImpl::Add(const ModuleUid& module,
                                 const smart_objects::SmartObject& module_data) {
-  LOG4CXX_TRACE(
-      logger_,
-      "module_type : " << module.first << " module_id : " << module.second);
+  SDL_LOG_TRACE("module_type : " << module.first
+                                 << " module_id : " << module.second);
   sync_primitives::AutoLock autolock(cached_data_lock_);
   auto it = cached_data_.find(module);
   if (cached_data_.end() == it) {
@@ -63,19 +62,17 @@ void InteriorDataCacheImpl::Add(const ModuleUid& module,
 
 smart_objects::SmartObject InteriorDataCacheImpl::Retrieve(
     const ModuleUid& module) const {
-  LOG4CXX_AUTO_TRACE(logger_);
+  SDL_LOG_AUTO_TRACE();
   sync_primitives::AutoLock autolock(cached_data_lock_);
   auto it = cached_data_.find(module);
   if (it == cached_data_.end()) {
-    LOG4CXX_WARN(logger_,
-                 "Module with type: " << module.first
+    SDL_LOG_WARN("Module with type: " << module.first
                                       << " and id: " << module.second
                                       << " was not found in cache");
     return smart_objects::SmartObject(smart_objects::SmartType_Null);
   }
-  LOG4CXX_TRACE(
-      logger_,
-      "module_type : " << module.first << " module_id : " << module.second);
+  SDL_LOG_TRACE("module_type : " << module.first
+                                 << " module_id : " << module.second);
   return it->second;
 }
 
@@ -92,34 +89,31 @@ std::vector<ModuleUid> InteriorDataCacheImpl::GetCachedModulesByType(
 }
 
 bool InteriorDataCacheImpl::Contains(const ModuleUid& module) const {
-  LOG4CXX_AUTO_TRACE(logger_);
+  SDL_LOG_AUTO_TRACE();
   sync_primitives::AutoLock autolock(cached_data_lock_);
   auto it = cached_data_.find(module);
   const bool contains = it != cached_data_.end();
-  LOG4CXX_TRACE(logger_,
-                "module_type : " << module.first
+  SDL_LOG_TRACE("module_type : " << module.first
                                  << " module_id : " << module.second << " "
                                  << (contains ? "true" : "false"));
   return contains;
 }
 
 void InteriorDataCacheImpl::Remove(const ModuleUid& module) {
-  LOG4CXX_TRACE(
-      logger_,
-      "module_type : " << module.first << " module_id : " << module.second);
+  SDL_LOG_TRACE("module_type : " << module.first
+                                 << " module_id : " << module.second);
   sync_primitives::AutoLock autolock(cached_data_lock_);
   auto it = cached_data_.find(module);
   if (cached_data_.end() == it) {
-    LOG4CXX_TRACE(
-        logger_,
-        "Not existing module : " << module.first << " " << module.second);
+    SDL_LOG_TRACE("Not existing module : " << module.first << " "
+                                           << module.second);
     return;
   }
   cached_data_.erase(it);
 }
 
 void InteriorDataCacheImpl::Clear() {
-  LOG4CXX_AUTO_TRACE(logger_);
+  SDL_LOG_AUTO_TRACE();
   sync_primitives::AutoLock autolock(cached_data_lock_);
   cached_data_.clear();
 }