[Badge] Log refactoring.

[Verification] TCT pass rate (r20): 100% (26/26/0/0/0)

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

diff --git a/src/badge/badge_instance.cc b/src/badge/badge_instance.cc
index 9984e21eb05adacba9d33f7a05aedc18456f7f6c..31f552c86829456bcfc475e238a843a4e6b7f5a1 100755 (executable)
--- a/src/badge/badge_instance.cc
+++ b/src/badge/badge_instance.cc
@@ -53,10 +53,11 @@ void BadgeInstance::BadgeManagerSetBadgeCount(const JsonValue& args,
 
   PlatformResult status = manager_.SetBadgeCount(
       app_id, static_cast<unsigned int>(count));
-  if (status.IsSuccess())
+  if (status.IsSuccess()) {
     ReportSuccess(out);
-  else
-    ReportError(status, &out);
+  } else {
+    LogAndReportError(status, &out, ("Failed to set badge count."));
+  }
 }
 
 void BadgeInstance::BadgeManagerGetBadgeCount(const JsonValue& args,
@@ -68,10 +69,11 @@ void BadgeInstance::BadgeManagerGetBadgeCount(const JsonValue& args,
   unsigned int count = 0;
   PlatformResult status =
       manager_.GetBadgeCount(app_id, &count);
-  if (status.IsSuccess())
+  if (status.IsSuccess()) {
     ReportSuccess(JsonValue(std::to_string(count)), out);
-  else
-    ReportError(status, &out);
+  } else {
+    LogAndReportError(status, &out, ("Failed to get badge count."));
+  }
 }
 
 void BadgeInstance::BadgeManagerAddChangeListener(const JsonValue& args,
@@ -80,10 +82,11 @@ void BadgeInstance::BadgeManagerAddChangeListener(const JsonValue& args,
   PlatformResult status =
       manager_.AddChangeListener(args.get<JsonObject>());
 
-  if (status.IsSuccess())
+  if (status.IsSuccess()) {
     ReportSuccess(out);
-  else
-    ReportError(status, &out);
+  } else {
+    LogAndReportError(status, &out, ("Failed to add change listener."));
+  }
 }
 
 void BadgeInstance::BadgeManagerRemoveChangeListener(const JsonValue& args,
@@ -92,10 +95,11 @@ void BadgeInstance::BadgeManagerRemoveChangeListener(const JsonValue& args,
   PlatformResult status =
       manager_.RemoveChangeListener(args.get<JsonObject>());
 
-  if (status.IsSuccess())
+  if (status.IsSuccess()) {
     ReportSuccess(out);
-  else
-    ReportError(status, &out);
+  } else {
+    LogAndReportError(status, &out, ("Failed to remove change listener."));
+  }
 }
 
 }  // namespace badge

diff --git a/src/badge/badge_manager.cc b/src/badge/badge_manager.cc
index f18905cd683536ce317b8fec439e4b60b361ea84..4d4ea7664a4a1da4237e7f5989b68998123fc0a5 100755 (executable)
--- a/src/badge/badge_manager.cc
+++ b/src/badge/badge_manager.cc
@@ -57,9 +57,9 @@ PlatformResult BadgeManager::SetBadgeCount(const std::string& app_id,
   SLoggerD("app_id : %s ", app_id.c_str());
 
   if (!IsAppInstalled(app_id)) {
-    LoggerE("Application is not installed");
-    return PlatformResult(ErrorCode::INVALID_VALUES_ERR,
-                          "InvalidValues error : app_id");
+    return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR,
+                              "InvalidValues error : app_id",
+                              ("Application is not installed"));
   }
 
   bool badge_exist = false;
@@ -67,53 +67,45 @@ PlatformResult BadgeManager::SetBadgeCount(const std::string& app_id,
   int ret = badge_is_existing(app_id_str, &badge_exist);
 
   if (ret != BADGE_ERROR_NONE) {
-    LoggerE("Unknown error : %d", ret);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Unknown error");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Unknown error", ("Unknown error: %d, %s", ret, get_error_message(ret)));
   }
 
   LoggerD("badge exist : %d", badge_exist);
 
   if (!badge_exist) {
     ret = badge_create(app_id_str, app_id_str);
-    LoggerD("badge_create() ret : %d", ret);
+    LoggerD("badge_create() ret : %d, %s", ret, get_error_message(ret));
 
     if (ret == BADGE_ERROR_PERMISSION_DENIED) {
-      LoggerE("Security error");
-      return PlatformResult(ErrorCode::SECURITY_ERR, "Security error");
+      return LogAndCreateResult(ErrorCode::SECURITY_ERR, "Security error");
 #ifdef PROFILE_WEARABLE
     } else if (ret == BADGE_ERROR_INVALID_DATA) {
 #else
     } else if (ret == BADGE_ERROR_INVALID_PARAMETER) {
 #endif
-      LoggerE("Invalid values error");
-      return PlatformResult(ErrorCode::INVALID_VALUES_ERR,
-                            "Invalid values error");
+      return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR,
+                                "Invalid values error");
     } else if (ret != BADGE_ERROR_NONE && ret != BADGE_ERROR_ALREADY_EXIST) {
-      LoggerE("Unknown error");
-      return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Unknown error");
+      return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Unknown error");
     }
   }
 
   ret = badge_set_count(app_id_str, count);
-  LoggerE("badge_set_count() ret : %d count : %d ", ret, count);
+  LoggerD("badge_set_count() ret : %d, %s, count : %d ", ret, get_error_message(ret), count);
 
   if (ret == BADGE_ERROR_PERMISSION_DENIED) {
-    LoggerE("Security error");
-    return PlatformResult(ErrorCode::SECURITY_ERR, "Security error");
+    return LogAndCreateResult(ErrorCode::SECURITY_ERR, "Security error");
   } else if (ret == BADGE_ERROR_NOT_EXIST) {
-    LoggerE("Application is not installed");
-    return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Application is not installed");
+    return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Application is not installed");
 #ifdef PROFILE_WEARABLE
   } else if (ret == BADGE_ERROR_INVALID_DATA) {
 #else
   } else if (ret == BADGE_ERROR_INVALID_PARAMETER) {
 #endif
-    LoggerE("Invalid values error");
-    return PlatformResult(ErrorCode::INVALID_VALUES_ERR,
-                          "Invalid values error");
+    return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR,
+                              "Invalid values error");
   } else if (ret != BADGE_ERROR_NONE) {
-    LoggerE("Unknown error : %d", ret);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Unknown error");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Unknown error", ("Unknown error : %d, %s", ret, get_error_message(ret)));
   }
 
   return PlatformResult(ErrorCode::NO_ERROR);
@@ -127,25 +119,25 @@ PlatformResult BadgeManager::GetBadgeCount(const std::string& app_id,
   Assert(count);
 
   if (!IsAppInstalled(app_id)) {
-    LoggerE("Application is not installed");
-    return PlatformResult(ErrorCode::INVALID_VALUES_ERR,
-                          "InvalidValues error : app_id");
+    return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR,
+                              "InvalidValues error : app_id",
+                              ("Application is not installed"));
   }
 
   bool badge_exist = false;
   int ret = badge_is_existing(app_id.c_str(), &badge_exist);
 
   if (ret != BADGE_ERROR_NONE) {
-    LoggerE("Unknown error : %d", ret);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                          "Platform error while checking badge.");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                              "Platform error while checking badge.",
+                              ("Unknown error : %d, %s", ret, get_error_message(ret)));
   }
 
   LoggerD("badge exist : %d", badge_exist);
 
   if (!badge_exist) {
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                          "badge not exist. app_id: " + app_id);
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                              "badge not exist. app_id: " + app_id);
   }
 
   *count = 0;
@@ -157,22 +149,19 @@ PlatformResult BadgeManager::GetBadgeCount(const std::string& app_id,
     case BADGE_ERROR_NONE:
       return PlatformResult(ErrorCode::NO_ERROR);
     case BADGE_ERROR_PERMISSION_DENIED:
-      LoggerE("Security error");
-      return PlatformResult(ErrorCode::SECURITY_ERR, "Security error.");
+      return LogAndCreateResult(ErrorCode::SECURITY_ERR, "Security error.");
     case BADGE_ERROR_NOT_EXIST:
-      LoggerE("Application is not installed");
-      return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Application is not installed");
+      return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Application is not installed");
 #ifdef PROFILE_WEARABLE
     case BADGE_ERROR_INVALID_DATA:
 #else
     case BADGE_ERROR_INVALID_PARAMETER:
 #endif
-      LoggerE("Invalid values error");
-      return PlatformResult(ErrorCode::INVALID_VALUES_ERR,
-                            "InvalidValues error : app_id");
+      return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR,
+                                "InvalidValues error : app_id");
     default:
-      LoggerE("Unknown error : %d", ret);
-      return PlatformResult(ErrorCode::UNKNOWN_ERR, "Unknown error");
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Unknown error",
+                                ("Unknown error : %d, %s", ret, get_error_message(ret)));
   }
 }
 
@@ -186,9 +175,9 @@ PlatformResult BadgeManager::AddChangeListener(const JsonObject &obj) {
   if (!is_cb_registered_) {
     ret = badge_register_changed_cb(badge_changed_cb, this);
     if (ret != BADGE_ERROR_NONE) {
-      LoggerE("Unknown error %d:", ret);
-      return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                            "Platform error while adding listener.");
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                                "Platform error while adding listener.",
+                                ("Unknown error: %d, %s", ret, get_error_message(ret)));
     }
     is_cb_registered_ = true;
   }
@@ -205,9 +194,9 @@ PlatformResult BadgeManager::RemoveChangeListener(const JsonObject &obj) {
   if (watched_applications_.empty() && is_cb_registered_) {
     int ret = badge_unregister_changed_cb(badge_changed_cb);
     if (ret != BADGE_ERROR_NONE) {
-      LoggerE("Unknown error : %d", ret);
-      return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                            "Platform error while removing listener.");
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                                "Platform error while removing listener.",
+                                ("Unknown error : %d, %s", ret, get_error_message(ret)));
     }
     is_cb_registered_ = false;
   }