[Alarm] - refactoring logs

Change-Id: I24a3efb20b64833e543e850e6ce44c4ac60d48cf
Signed-off-by: Andrzej Popowski <a.popowski@samsung.com>

diff --git a/src/alarm/alarm_manager.cc b/src/alarm/alarm_manager.cc
index f1a0a97b27a05094b9e74a8c392459b328f2a1b7..999c12f6365ac9cad65144c594eceddff41b1c3e 100755 (executable)
--- a/src/alarm/alarm_manager.cc
+++ b/src/alarm/alarm_manager.cc
@@ -74,8 +74,7 @@ void AlarmManager::Add(const picojson::value& args, picojson::object& out) {
   LoggerD("Entered");
 
   if (!args.contains("alarm")) {
-    LoggerE("Invalid parameter passed.");
-    ReportError(PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Invalid parameter passed."), &out);
+    LogAndReportError(PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Invalid parameter passed."), &out);
     return;
   }
   const picojson::object& alarm = args.get("alarm").get<picojson::object>();
@@ -99,8 +98,7 @@ void AlarmManager::Add(const picojson::value& args, picojson::object& out) {
     PlatformResult result = util::AppControlToService(
         args.get("appControl").get<picojson::object>(), &app_control);
     if (!result) {
-      LoggerE("Failed: util::AppControlToService");
-      ReportError(result, &out);
+      LogAndReportError(result, &out, ("Failed: util::AppControlToService"));
       return;
     }
   } else {
@@ -119,8 +117,7 @@ void AlarmManager::Add(const picojson::value& args, picojson::object& out) {
     const auto it_period = alarm.find("period");
 
     if (alarm.end() == it_delay || alarm.end() == it_period || !it_delay->second.is<double>()) {
-      LoggerE("Invalid parameter passed.");
-      ReportError(PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Invalid parameter passed."), &out);
+      LogAndReportError(PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Invalid parameter passed."), &out);
       return;
     }
     int delay = static_cast<int>(it_delay->second.get<double>());
@@ -133,16 +130,17 @@ void AlarmManager::Add(const picojson::value& args, picojson::object& out) {
     std::string delay_str = std::to_string(delay);
     int ret = app_control_add_extra_data(app_control, kAlarmRelativeDelayKey, delay_str.c_str());
     if (APP_CONTROL_ERROR_NONE != ret) {
-      LoggerE("Fail to add data from app_control: %d (%s)", ret, get_error_message(ret));
-      ReportError(PlatformResult(
-          ErrorCode::UNKNOWN_ERR, "Fail to add data from app_control."), &out);
+      LogAndReportError(PlatformResult(
+          ErrorCode::UNKNOWN_ERR, "Fail to add data from app_control."), &out,
+          ("Fail to add data from app_control: %d (%s)", ret, get_error_message(ret)));
       return;
     }
 
     ret = alarm_schedule_after_delay(app_control, delay, period, &alarm_id);
     if (ALARM_ERROR_NONE != ret) {
-      LoggerE("Error while add alarm to server: %d (%s)", ret, get_error_message(ret));
-      ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Error while add alarm to server."), &out);
+      LogAndReportError(PlatformResult(
+          ErrorCode::UNKNOWN_ERR, "Error while add alarm to server."), &out,
+          ("Error while add alarm to server: %d (%s)", ret, get_error_message(ret)));
       return;
     }
   } else {
@@ -163,8 +161,7 @@ void AlarmManager::Add(const picojson::value& args, picojson::object& out) {
 
     tzset();
     if (nullptr == localtime_r(&second, &start_date)) {
-      LoggerE("Invalid date.");
-      ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Invalid date."), &out);
+      LogAndReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Invalid date."), &out);
       return;
     }
 
@@ -203,8 +200,7 @@ void AlarmManager::Add(const picojson::value& args, picojson::object& out) {
         } else if (kSaturdayShort == day) {
           repeat_value |= ALARM_WEEK_FLAG_SATURDAY;
         } else {
-          LoggerE("Invalid days of the week value.");
-          ReportError(PlatformResult(
+          LogAndReportError(PlatformResult(
               ErrorCode::TYPE_MISMATCH_ERR, "Invalid days of the week value."), &out);
           return;
         }
@@ -216,8 +212,9 @@ void AlarmManager::Add(const picojson::value& args, picojson::object& out) {
     }
 
     if (ALARM_ERROR_NONE != ret) {
-      LoggerE("Adding alarm to server failed: %d (%s)", ret, get_error_message(ret));
-      ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Adding alarm to server failed."), &out);
+      LogAndReportError(PlatformResult(
+                            ErrorCode::UNKNOWN_ERR, "Adding alarm to server failed."), &out,
+                            ("Adding alarm to server failed: %d (%s)", ret, get_error_message(ret)));
       return;
     }
   }
@@ -240,8 +237,9 @@ void AlarmManager::Remove(const picojson::value& args, picojson::object& out) {
   }
 
   if (id <= 0) {
-      LoggerE("id is wrong: %d", id);
-      ReportError(PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Invalid id."), &out);
+      LogAndReportError(PlatformResult(
+                            ErrorCode::INVALID_VALUES_ERR, "Invalid id."), &out,
+                            ("id is wrong: %d", id));
       return;
   }
 
@@ -249,11 +247,11 @@ void AlarmManager::Remove(const picojson::value& args, picojson::object& out) {
   if (ALARM_ERROR_NONE == ret) {
     ReportSuccess(out);
   } else if (ALARM_ERROR_INVALID_PARAMETER == ret) {
-    LoggerE("Alarm not found.");
-    ReportError(PlatformResult(ErrorCode::NOT_FOUND_ERR, "Alarm not found."), &out);
+    LogAndReportError(PlatformResult(ErrorCode::NOT_FOUND_ERR, "Alarm not found."), &out);
   } else {
-    LoggerE("Platform unknown error: %d (%s)", ret, get_error_message(ret));
-    ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Platform unknown error."), &out);
+    LogAndReportError(PlatformResult(
+                          ErrorCode::UNKNOWN_ERR, "Platform unknown error."), &out,
+                          ("Platform unknown error: %d (%s)", ret, get_error_message(ret)));
   }
 }
 
@@ -262,8 +260,9 @@ void AlarmManager::RemoveAll(const picojson::value& args, picojson::object& out)
 
   int ret = alarm_cancel_all();
   if (ALARM_ERROR_NONE != ret) {
-    LoggerE("Platform unknown error: %d (%s)", ret, get_error_message(ret));
-    ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Platform unknown error."), &out);
+    LogAndReportError(PlatformResult(
+                          ErrorCode::UNKNOWN_ERR, "Platform unknown error."), &out,
+                          ("Platform unknown error: %d (%s)", ret, get_error_message(ret)));
     return;
   }
 
@@ -274,8 +273,7 @@ PlatformResult AlarmManager::GetAlarm(int id, picojson::object& obj) {
   LoggerD("Entered");
 
   if (id <= 0) {
-    LoggerE("id is wrong: %d", id);
-    return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Invalid id.");
+    return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Invalid id.", ("id is wrong: %d", id));
   }
 
   int ret = ALARM_ERROR_NONE;
@@ -293,14 +291,14 @@ PlatformResult AlarmManager::GetAlarm(int id, picojson::object& obj) {
 
   ret = alarm_get_app_control(id, &app_control);
   if (ALARM_ERROR_NONE != ret) {
-    LoggerE("Alarm not found: %d (%s)", ret, get_error_message(ret));
-    return PlatformResult(ErrorCode::NOT_FOUND_ERR, "Alarm not found.");
+    return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR, "Alarm not found.",
+                              ("Alarm not found: %d (%s)", ret, get_error_message(ret)));
   }
 
   ret = app_control_get_extra_data(app_control, kAlarmKeyType, &alarm_type);
   if (APP_CONTROL_ERROR_NONE != ret) {
-    LoggerE("Getting data failed: %d (%s)", ret, get_error_message(ret));
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Unknown error occurred.");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Unknown error occurred.",
+                              ("Getting data failed: %d (%s)", ret, get_error_message(ret)));
   }
 
   obj.insert(std::make_pair("id", picojson::value(std::to_string(id))));
@@ -312,8 +310,8 @@ PlatformResult AlarmManager::GetAlarm(int id, picojson::object& obj) {
     ret = app_control_get_extra_data(app_control, kAlarmAbsoluteDateKey, &date_string);
 
     if (APP_CONTROL_ERROR_NONE != ret) {
-      LoggerE("Failed to get data: %d (%s)", ret, get_error_message(ret));
-      return PlatformResult(ErrorCode::NOT_FOUND_ERR, "Failed to get data.");
+      return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR, "Failed to get data.",
+                                ("Failed to get data: %d (%s)", ret, get_error_message(ret)));
     }
 
     sscanf(date_string, "%5d %5d %5d %5d %5d %5d %5d", &date.tm_year, &date.tm_mon,
@@ -334,8 +332,8 @@ PlatformResult AlarmManager::GetAlarm(int id, picojson::object& obj) {
     if (!strcmp(alarm_type, kAlarmAbsoluteReccurrenceTypeInterval)) {
       ret = alarm_get_scheduled_period(id, &interval);
       if (ALARM_ERROR_NONE != ret) {
-        LoggerE("Unknown error occurred: %d (%s)", ret, get_error_message(ret));
-        return PlatformResult(ErrorCode::UNKNOWN_ERR, "Unknown error occurred.");
+        return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Unknown error occurred.",
+                                  ("Unknown error occurred: %d (%s)", ret, get_error_message(ret)));
       }
 
       obj.insert(std::make_pair("second", picojson::value(std::to_string(interval))));
@@ -344,8 +342,8 @@ PlatformResult AlarmManager::GetAlarm(int id, picojson::object& obj) {
 
       ret = alarm_get_scheduled_recurrence_week_flag(id, &byDayValue);
       if (ALARM_ERROR_NONE != ret) {
-        LoggerE("Failed to get data: %d (%s)", ret, get_error_message(ret));
-        return PlatformResult(ErrorCode::NOT_FOUND_ERR, "Failed to get data.");
+        return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR, "Failed to get data.",
+                                  ("Failed to get data: %d (%s)", ret, get_error_message(ret)));
       }
 
       picojson::array& array =
@@ -375,22 +373,21 @@ PlatformResult AlarmManager::GetAlarm(int id, picojson::object& obj) {
 
     ret = alarm_get_scheduled_period(id, &interval);
     if (ALARM_ERROR_NONE != ret) {
-      LoggerE("Unknown error occurred: %d (%s)", ret, get_error_message(ret));
-      return PlatformResult(ErrorCode::UNKNOWN_ERR, "Unknown error occurred.");
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Unknown error occurred.",
+                                ("Unknown error occurred: %d (%s)", ret, get_error_message(ret)));
     }
 
     ret = app_control_get_extra_data(app_control, kAlarmRelativeDelayKey, &delay_string);
     if (APP_CONTROL_ERROR_NONE != ret) {
-      LoggerE("Failed to get data: %d (%s)", ret, get_error_message(ret));
-      return PlatformResult(ErrorCode::NOT_FOUND_ERR, "Failed to get data.");
+      return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR, "Failed to get data.",
+                                ("Failed to get data: %d (%s)", ret, get_error_message(ret)));
     }
 
     obj.insert(std::make_pair("type", picojson::value(kAlarmRelative)));
     obj.insert(std::make_pair("delay", picojson::value(delay_string)));
     obj.insert(std::make_pair("period", picojson::value(std::to_string(interval))));
   } else {
-    LoggerE("Unknown error occurred.");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Unknown error occurred.");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Unknown error occurred.");
   }
 
   return PlatformResult(ErrorCode::NO_ERROR);
@@ -411,7 +408,7 @@ void AlarmManager::Get(const picojson::value& args, picojson::object& out) {
   PlatformResult platform_result = GetAlarm(id, result_obj);
 
   if (!platform_result) {
-    ReportError(platform_result, &out);
+    LogAndReportError(platform_result, &out);
   } else {
     ReportSuccess(result, out);
   }
@@ -433,8 +430,9 @@ void AlarmManager::GetAll(const picojson::value& args, picojson::object& out) {
   int ret = alarm_foreach_registered_alarm(AlarmIterateCB, &alarm_ids);
 
   if (ALARM_ERROR_NONE != ret) {
-    LoggerE("Platform unknown error: %d (%s)", ret, get_error_message(ret));
-    ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Platform unknown error."), &out);
+    LogAndReportError(PlatformResult(
+                          ErrorCode::UNKNOWN_ERR, "Platform unknown error."), &out,
+                          ("Platform unknown error: %d (%s)", ret, get_error_message(ret)));
     return;
   }
 
@@ -447,8 +445,7 @@ void AlarmManager::GetAll(const picojson::value& args, picojson::object& out) {
 
     PlatformResult platform_result = GetAlarm(alarm_ids.at(i), obj);
     if (!platform_result) {
-      LoggerE("Failed GetAlarm()");
-      ReportError(platform_result, &out);
+      LogAndReportError(platform_result, &out, ("Failed GetAlarm()"));
       return;
     }
     array_obj.push_back(result);
@@ -482,8 +479,7 @@ void AlarmManager::GetRemainingSeconds(const picojson::value& args, picojson::ob
       ReportSuccess(result, out);
       return;
     } else {
-      LoggerE("Platform unknown error.");
-      ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Platform unknown error."), &out);
+      LogAndReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Platform unknown error."), &out);
       return;
     }
   }

diff --git a/src/alarm/alarm_utils.cc b/src/alarm/alarm_utils.cc
index 611c5e4d0b3dec21b2d4b8b776296426e7a702eb..09b2c20d1a38653ce5d08c5fb7ad38528f78165f 100755 (executable)
--- a/src/alarm/alarm_utils.cc
+++ b/src/alarm/alarm_utils.cc
@@ -31,24 +31,23 @@ PlatformResult AppControlToService(const picojson::object& obj, app_control_h *a
 
   const auto it_operation = obj.find("operation");
   if (it_operation == it_end || !it_operation->second.is<std::string>()) {
-    LoggerE("Invalid parameter passed.");
-    return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Invalid parameter passed.");
+    return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Invalid parameter passed.");
   }
 
   app_control_create(app_control);
 
   int ret = app_control_set_operation(*app_control, it_operation->second.get<std::string>().c_str());
   if (APP_CONTROL_ERROR_NONE != ret) {
-    LoggerE("Failed app_control_set_operation(): %d (%s)", ret, get_error_message(ret));
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Error while setting operation.");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Error while setting operation.",
+                              ("Failed app_control_set_operation(): %d (%s)", ret, get_error_message(ret)));
   }
 
   const auto it_uri = obj.find("uri");
   if (it_end != it_uri && it_uri->second.is<std::string>()) {
     ret = app_control_set_uri(*app_control, it_uri->second.get<std::string>().c_str());
     if (APP_CONTROL_ERROR_NONE != ret) {
-      LoggerE("Failed app_control_set_uri(): %d (%s)", ret, get_error_message(ret));
-      return PlatformResult(ErrorCode::UNKNOWN_ERR, "Error while setting uri.");
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Error while setting uri.",
+                                ("Failed app_control_set_uri(): %d (%s)", ret, get_error_message(ret)));
     }
   }
 
@@ -56,8 +55,8 @@ PlatformResult AppControlToService(const picojson::object& obj, app_control_h *a
   if (it_end != it_mime && it_mime->second.is<std::string>()) {
     ret = app_control_set_mime(*app_control, it_mime->second.get<std::string>().c_str());
     if (APP_CONTROL_ERROR_NONE != ret) {
-      LoggerE("Failed app_control_set_mime(): %d (%s)", ret, get_error_message(ret));
-      return PlatformResult(ErrorCode::UNKNOWN_ERR, "Error while setting mime.");
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Error while setting mime.",
+                                ("Failed app_control_set_mime(): %d (%s)", ret, get_error_message(ret)));
     }
   }
 
@@ -65,8 +64,8 @@ PlatformResult AppControlToService(const picojson::object& obj, app_control_h *a
   if (it_end != it_category && it_category->second.is<std::string>()) {
     ret = app_control_set_category(*app_control, it_category->second.get<std::string>().c_str());
     if (APP_CONTROL_ERROR_NONE != ret) {
-      LoggerE("Failed app_control_set_category(): %d (%s)", ret, get_error_message(ret));
-      return PlatformResult(ErrorCode::UNKNOWN_ERR, "Error while setting category.");
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Error while setting category.",
+                                ("Failed app_control_set_category(): %d (%s)", ret, get_error_message(ret)));
     }
   }
 
@@ -99,8 +98,7 @@ PlatformResult AppControlToServiceExtraData(const picojson::object& app_obj,
       it_value == it_end ||
       !it_key->second.is<std::string>() ||
       !it_value->second.is<picojson::array>()) {
-    LoggerE("Problem with key or value.");
-    return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Problem with key or value.");
+    return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Problem with key or value.");
   }
 
   const std::string& key = it_key->second.get<std::string>();
@@ -123,8 +121,8 @@ PlatformResult AppControlToServiceExtraData(const picojson::object& app_obj,
   delete[] arr;
 
   if (APP_CONTROL_ERROR_NONE != ret) {
-    LoggerD("Error while setting data: %d (%s)", ret, get_error_message(ret));
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Error while setting data.");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Error while setting data.",
+                              ("Error while setting data: %d (%s)", ret, get_error_message(ret)));
   }
 
   return PlatformResult(ErrorCode::NO_ERROR);