[Alarm] Added error messages.

[Features] Commit migrated from tv branch.
http://165.213.149.170/gerrit/#/c/77360

[Verification] Code compiles. TCT 100%

Change-Id: I9ae5d2c3a4cbaf55954aacdb9de761ff74bbec4d
Signed-off-by: Tomasz Marciniak <t.marciniak@samsung.com>

diff --git a/src/alarm/alarm_manager.cc b/src/alarm/alarm_manager.cc
index 066addc950c4eb6671ea75f643391c5d42efedd2..f1a0a97b27a05094b9e74a8c392459b328f2a1b7 100755 (executable)
--- a/src/alarm/alarm_manager.cc
+++ b/src/alarm/alarm_manager.cc
@@ -133,7 +133,7 @@ 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.");
+      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);
       return;
@@ -141,7 +141,7 @@ void AlarmManager::Add(const picojson::value& args, picojson::object& out) {
 
     ret = alarm_schedule_after_delay(app_control, delay, period, &alarm_id);
     if (ALARM_ERROR_NONE != ret) {
-      LoggerE("Error while add alarm to server.");
+      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);
       return;
     }
@@ -216,7 +216,7 @@ void AlarmManager::Add(const picojson::value& args, picojson::object& out) {
     }
 
     if (ALARM_ERROR_NONE != ret) {
-      LoggerE("Adding alarm to server failed.");
+      LoggerE("Adding alarm to server failed: %d (%s)", ret, get_error_message(ret));
       ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Adding alarm to server failed."), &out);
       return;
     }
@@ -252,7 +252,7 @@ void AlarmManager::Remove(const picojson::value& args, picojson::object& out) {
     LoggerE("Alarm not found.");
     ReportError(PlatformResult(ErrorCode::NOT_FOUND_ERR, "Alarm not found."), &out);
   } else {
-    LoggerE("Platform unknown error.");
+    LoggerE("Platform unknown error: %d (%s)", ret, get_error_message(ret));
     ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Platform unknown error."), &out);
   }
 }
@@ -260,8 +260,9 @@ void AlarmManager::Remove(const picojson::value& args, picojson::object& out) {
 void AlarmManager::RemoveAll(const picojson::value& args, picojson::object& out) {
   LoggerD("Entered");
 
-  if (ALARM_ERROR_NONE != alarm_cancel_all()) {
-    LoggerE("Platform unknown error.");
+  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);
     return;
   }
@@ -292,13 +293,13 @@ 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");
+    LoggerE("Alarm not found: %d (%s)", ret, get_error_message(ret));
     return PlatformResult(ErrorCode::NOT_FOUND_ERR, "Alarm not found.");
   }
 
   ret = app_control_get_extra_data(app_control, kAlarmKeyType, &alarm_type);
   if (APP_CONTROL_ERROR_NONE != ret) {
-    LoggerE("Getting data failed");
+    LoggerE("Getting data failed: %d (%s)", ret, get_error_message(ret));
     return PlatformResult(ErrorCode::UNKNOWN_ERR, "Unknown error occurred.");
   }
 
@@ -311,7 +312,7 @@ 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.");
+      LoggerE("Failed to get data: %d (%s)", ret, get_error_message(ret));
       return PlatformResult(ErrorCode::NOT_FOUND_ERR, "Failed to get data.");
     }
 
@@ -333,7 +334,7 @@ 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.");
+        LoggerE("Unknown error occurred: %d (%s)", ret, get_error_message(ret));
         return PlatformResult(ErrorCode::UNKNOWN_ERR, "Unknown error occurred.");
       }
 
@@ -343,7 +344,7 @@ 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.");
+        LoggerE("Failed to get data: %d (%s)", ret, get_error_message(ret));
         return PlatformResult(ErrorCode::NOT_FOUND_ERR, "Failed to get data.");
       }
 
@@ -374,13 +375,13 @@ PlatformResult AlarmManager::GetAlarm(int id, picojson::object& obj) {
 
     ret = alarm_get_scheduled_period(id, &interval);
     if (ALARM_ERROR_NONE != ret) {
-      LoggerE("Unknown error occurred.");
+      LoggerE("Unknown error occurred: %d (%s)", ret, get_error_message(ret));
       return PlatformResult(ErrorCode::UNKNOWN_ERR, "Unknown error occurred.");
     }
 
     ret = app_control_get_extra_data(app_control, kAlarmRelativeDelayKey, &delay_string);
     if (APP_CONTROL_ERROR_NONE != ret) {
-      LoggerE("Failed to get data.");
+      LoggerE("Failed to get data: %d (%s)", ret, get_error_message(ret));
       return PlatformResult(ErrorCode::NOT_FOUND_ERR, "Failed to get data.");
     }
 
@@ -432,7 +433,7 @@ 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.");
+    LoggerE("Platform unknown error: %d (%s)", ret, get_error_message(ret));
     ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Platform unknown error."), &out);
     return;
   }
@@ -475,7 +476,7 @@ void AlarmManager::GetRemainingSeconds(const picojson::value& args, picojson::ob
 
   int ret = alarm_get_scheduled_date(id, &date);
   if(ALARM_ERROR_NONE != ret) {
-    LoggerI("alarm_get_scheduled_date error %d", ret);
+    LoggerI("alarm_get_scheduled_date error: %d (%s)", ret, get_error_message(ret));
     if (ALARM_ERROR_INVALID_PARAMETER == ret || ALARM_ERROR_CONNECTION_FAIL == ret) {
       result_obj.insert(std::make_pair("seconds", picojson::value()));
       ReportSuccess(result, out);

diff --git a/src/alarm/alarm_utils.cc b/src/alarm/alarm_utils.cc
index 6068547e7d62ef2abd1b6e4b491e08f63302dd96..611c5e4d0b3dec21b2d4b8b776296426e7a702eb 100755 (executable)
--- a/src/alarm/alarm_utils.cc
+++ b/src/alarm/alarm_utils.cc
@@ -39,7 +39,7 @@ PlatformResult AppControlToService(const picojson::object& obj, app_control_h *a
 
   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)", ret);
+    LoggerE("Failed app_control_set_operation(): %d (%s)", ret, get_error_message(ret));
     return PlatformResult(ErrorCode::UNKNOWN_ERR, "Error while setting operation.");
   }
 
@@ -47,7 +47,7 @@ PlatformResult AppControlToService(const picojson::object& obj, app_control_h *a
   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)", ret);
+      LoggerE("Failed app_control_set_uri(): %d (%s)", ret, get_error_message(ret));
       return PlatformResult(ErrorCode::UNKNOWN_ERR, "Error while setting uri.");
     }
   }
@@ -56,7 +56,7 @@ 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)", ret);
+      LoggerE("Failed app_control_set_mime(): %d (%s)", ret, get_error_message(ret));
       return PlatformResult(ErrorCode::UNKNOWN_ERR, "Error while setting mime.");
     }
   }
@@ -65,7 +65,7 @@ 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)", ret);
+      LoggerE("Failed app_control_set_category(): %d (%s)", ret, get_error_message(ret));
       return PlatformResult(ErrorCode::UNKNOWN_ERR, "Error while setting category.");
     }
   }
@@ -123,7 +123,7 @@ PlatformResult AppControlToServiceExtraData(const picojson::object& app_obj,
   delete[] arr;
 
   if (APP_CONTROL_ERROR_NONE != ret) {
-    LoggerD("Error while setting data.");
+    LoggerD("Error while setting data: %d (%s)", ret, get_error_message(ret));
     return PlatformResult(ErrorCode::UNKNOWN_ERR, "Error while setting data.");
   }