[NBS] Log refactoring.

[Verification] Module disabled, not tested..

Change-Id: I9647222fa458338d0b5572dfce0c56c04208de57
Signed-off-by: Pawel Andruszkiewicz <p.andruszkie@samsung.com>

diff --git a/src/networkbearerselection/networkbearerselection_instance.cc b/src/networkbearerselection/networkbearerselection_instance.cc
index 49f3e85ae1456f60e6d35d28e4605184afed540c..2c13d3fbbd05913cad771573128ce56bcc51fa3e 100644 (file)
--- a/src/networkbearerselection/networkbearerselection_instance.cc
+++ b/src/networkbearerselection/networkbearerselection_instance.cc
@@ -55,10 +55,10 @@ NetworkBearerSelectionInstance::~NetworkBearerSelectionInstance() {
   NetworkBearerSelectionManager::GetInstance()->RemoveListener(this);
 }
 
-#define CHECK_EXIST(args, name, out)                                       \
-  if (!args.contains(name)) {                                              \
-    ReportError(TypeMismatchException(name " is required argument"), out); \
-    return;                                                                \
+#define CHECK_EXIST(args, name, out)                                             \
+  if (!args.contains(name)) {                                                    \
+    LogAndReportError(TypeMismatchException(name " is required argument"), out); \
+    return;                                                                      \
   }
 
 void NetworkBearerSelectionInstance::NetworkBearerSelectionRequestRouteToHost(
@@ -97,10 +97,11 @@ void NetworkBearerSelectionInstance::NetworkBearerSelectionReleaseRouteToHost(
     LoggerD("enter");
     picojson::value response = picojson::value(picojson::object());
     picojson::object& obj = response.get<picojson::object>();
-    if (status)
+    if (status) {
       ReportSuccess(obj);
-    else
-      ReportError(UnknownException("PLATFORM ERROR"), obj);
+    } else {
+      LogAndReportError(UnknownException("PLATFORM ERROR"), obj, ("Failed to release route to host (callback)"));
+    }
     obj["callbackId"] = picojson::value(callback_id);
     Instance::PostMessage(this, response.serialize().c_str());
   };
@@ -115,7 +116,7 @@ void NetworkBearerSelectionInstance::NetworkBearerSelectionReleaseRouteToHost(
   if (status) {
     ReportSuccess(out);
   } else {
-    ReportError(status, &out);
+    LogAndReportError(status, &out, ("Failed to release route to host"));
   }
 }
 
@@ -143,7 +144,7 @@ void NetworkBearerSelectionInstance::onNBSError(const std::string& domain_name,
   LoggerD("enter");
   picojson::value event = picojson::value(picojson::object());
   picojson::object& obj = event.get<picojson::object>();
-  ReportError(UnknownException(info), obj);
+  LogAndReportError(UnknownException(info), obj);
   obj["domainName"] = picojson::value(domain_name);
   obj["state"] = picojson::value("Error");
 

diff --git a/src/networkbearerselection/networkbearerselection_manager.cc b/src/networkbearerselection/networkbearerselection_manager.cc
index 1abbbf3aa529bafa2e1ca3c77c6d87a0f71d7fd8..7a1b81c4c5c2433d934b0a12d04e7a4f8e2be676 100644 (file)
--- a/src/networkbearerselection/networkbearerselection_manager.cc
+++ b/src/networkbearerselection/networkbearerselection_manager.cc
@@ -289,7 +289,7 @@ common::PlatformResult NetworkBearerSelectionManager::releaseRouteToHost(
       LoggerD("list size : %i", m_domain_names_.size());
       if (m_domain_names_.size() == 0) {
         if (!m_profile_handle_) {
-          return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, "Already in use");
+          return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "Already in use");
         }
 
         if (connection_profile_unset_state_changed_cb(m_profile_handle_) !=
@@ -323,7 +323,7 @@ common::PlatformResult NetworkBearerSelectionManager::releaseRouteToHost(
     }
   }
 
-  return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, "Invalid argument");
+  return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "Invalid argument");
 }
 
 void NetworkBearerSelectionManager::registStateChangeListener(