From: Lukasz Bardeli Date: Wed, 25 Nov 2015 11:18:33 +0000 (+0100) Subject: [CallHistory] update logs X-Git-Tag: submit/tizen_mobile/20151215.080542^2~67^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=86b6be6dbc64f9e93305713b6895a37f6bd5fd53;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [CallHistory] update logs Verification] Code compiles without errors Change-Id: I43b355cde9c384ecbece7c185b48efd4eebf825e Signed-off-by: Lukasz Bardeli --- diff --git a/src/callhistory/callhistory.cc b/src/callhistory/callhistory.cc index a7943033..7111777f 100755 --- a/src/callhistory/callhistory.cc +++ b/src/callhistory/callhistory.cc @@ -102,8 +102,7 @@ void CallHistory::FindThread(const picojson::object& args, CallHistory* call_his const double callback_id = args.find("callbackId")->second.get(); if (phone_numbers == 0) { - LoggerE("Phone numbers list is empty."); - ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Phone numbers list is empty."), + LogAndReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Phone numbers list is empty."), &response->get()); } else { const auto it_args_end = args.end(); @@ -322,17 +321,16 @@ PlatformResult CallHistory::remove(const picojson::object& args) if (it_uid == it_args_end || !it_uid->second.is()) { - LoggerE("Invalid parameter was passed."); - return PlatformResult(ErrorCode::INVALID_VALUES_ERR, + return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Invalid parameter was passed."); } int uid = atoi((it_uid->second.get()).c_str()); int ret = contacts_db_delete_record(_contacts_phone_log._uri, (int)uid); if (CONTACTS_ERROR_NONE != ret) { - LoggerE("Failed to delete log record [%d] with error: %d", uid, ret); - return PlatformResult(ErrorCode::UNKNOWN_ERR, - "Failed to delete log record."); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, + "Failed to delete log record.", + ("Failed to delete log record [%d] with error: %d", uid, ret)); } return PlatformResult(ErrorCode::NO_ERROR); } @@ -346,8 +344,7 @@ common::PlatformResult CallHistory::removeBatch(const picojson::object& args) if (it_uid == it_args_end || !it_uid->second.is()) { - LoggerE("Invalid parameter was passed."); - return PlatformResult(ErrorCode::INVALID_VALUES_ERR, + return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Invalid parameter was passed."); } const picojson::array& uids = it_uid->second.get(); @@ -355,7 +352,7 @@ common::PlatformResult CallHistory::removeBatch(const picojson::object& args) auto remove_batch = [uids](const std::shared_ptr& response) -> void { if (uids.size() == 0) { - ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, + LogAndReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Object is null."), &response->get()); return; @@ -366,10 +363,10 @@ common::PlatformResult CallHistory::removeBatch(const picojson::object& args) int uid = atoi(uids[i].get().c_str()); ret = contacts_db_delete_record(_contacts_phone_log._uri, (int)uid); if (CONTACTS_ERROR_NONE != ret) { - LoggerE("Failed to delete log [%d] with code %d", uid, ret); - ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, + LogAndReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Remove record failed."), - &response->get()); + &response->get() + ("Failed to delete log [%d] with code %d", uid, ret)); return; } } @@ -418,8 +415,7 @@ void CallHistory::removeAll(const picojson::object& args) ret = contacts_db_get_all_records(_contacts_phone_log._uri, 0, 0, &record_list); if (CONTACTS_ERROR_NONE != ret || !record_list) { - LoggerE("Failed to get all records list"); - ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, + LogAndReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to get all records list."), &response->get()); return; @@ -441,10 +437,10 @@ void CallHistory::removeAll(const picojson::object& args) if (!record) { ret = contacts_list_next(record_list); if (CONTACTS_ERROR_NONE != ret && CONTACTS_ERROR_NO_DATA != ret) { - LoggerE("contacts_list_next function failed"); - ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, + LogAndReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Get next record from list failed."), - &response->get()); + &response->get(),\ + ("contacts_list_next function failed")); return; } continue; @@ -460,10 +456,10 @@ void CallHistory::removeAll(const picojson::object& args) value = 0; ret = contacts_list_next(record_list); if (CONTACTS_ERROR_NONE != ret && CONTACTS_ERROR_NO_DATA != ret) { - LoggerE("contacts_list_next function failed"); - ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, + LogAndReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Get next record from list failed."), - &response->get()); + &response->get(), + ("contacts_list_next function failed")); return; } } @@ -471,10 +467,10 @@ void CallHistory::removeAll(const picojson::object& args) if (cnt > 0) { ret = contacts_db_delete_records(_contacts_phone_log._uri, list, cnt); if (CONTACTS_ERROR_NONE != ret) { - LoggerE("contacts_db_delete_records function failed"); - ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, + LogAndReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Delete records function failed."), - &response->get()); + &response->get(), + ("contacts_db_delete_records function failed")); return; } } @@ -624,8 +620,7 @@ PlatformResult CallHistory::startCallHistoryChangeListener() changeListenerCB, this); if (CONTACTS_ERROR_NONE != ret) { - LoggerE("Failed to add ChangeListener"); - return PlatformResult(ErrorCode::UNKNOWN_ERR, + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Failed to add ChangeListener"); } } @@ -642,8 +637,7 @@ PlatformResult CallHistory::stopCallHistoryChangeListener() changeListenerCB, this); if (CONTACTS_ERROR_NONE != ret) { - LoggerE("Failed to remove ChangeListener"); - return PlatformResult(ErrorCode::UNKNOWN_ERR, + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Failed to remove ChangeListener"); } } @@ -664,14 +658,14 @@ PlatformResult CallHistory::setMissedDirection(int uid) int ret = contacts_db_get_record(_contacts_phone_log._uri, uid, &record); if (CONTACTS_ERROR_NONE != ret) { - LoggerE("Failed to get record [%d]", ret); - return PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to get record"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Failed to get record", + ("Failed to get record [%d]", ret)); } ret = contacts_record_get_int(record, _contacts_phone_log.log_type, &log_type); if (CONTACTS_ERROR_NONE != ret) { - LoggerE("Failed to get log type [%d]", ret); - return PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to get log type"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Failed to get log type", + ("Failed to get log type [%d]", ret)); } if (CONTACTS_PLOG_TYPE_VOICE_INCOMMING_UNSEEN == log_type) { @@ -685,14 +679,14 @@ PlatformResult CallHistory::setMissedDirection(int uid) } if (CONTACTS_ERROR_NONE != ret) { - LoggerE("Failed to set direction [%d]", ret); - return PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to set direction"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Failed to set direction", + ("Failed to set direction [%d]", ret)); } ret = contacts_db_update_record(record); if (CONTACTS_ERROR_NONE != ret) { - LoggerE("Failed to update record [%d]", ret); - return PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to update record"); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Failed to update record", + ("Failed to update record [%d]", ret)); } return PlatformResult(ErrorCode::NO_ERROR); diff --git a/src/callhistory/callhistory_instance.cc b/src/callhistory/callhistory_instance.cc index 7b749101..67743322 100755 --- a/src/callhistory/callhistory_instance.cc +++ b/src/callhistory/callhistory_instance.cc @@ -59,7 +59,7 @@ void CallHistoryInstance::Remove(const picojson::value& args, picojson::object& if (result.IsSuccess()) { ReportSuccess(out); } else { - ReportError(result, &out); + LogAndReportError(result, &out); } } @@ -69,7 +69,7 @@ void CallHistoryInstance::RemoveBatch(const picojson::value& args, picojson::obj if (result.IsSuccess()) { ReportSuccess(out); } else { - ReportError(result, &out); + LogAndReportError(result, &out); } } @@ -85,7 +85,7 @@ void CallHistoryInstance::AddChangeListener(const picojson::value& args, picojso if (result.IsSuccess()) { ReportSuccess(out); } else { - ReportError(result, &out); + LogAndReportError(result, &out); } } @@ -95,7 +95,7 @@ void CallHistoryInstance::RemoveChangeListener(const picojson::value& args, pico if (result.IsSuccess()) { ReportSuccess(out); } else { - ReportError(result, &out); + LogAndReportError(result, &out); } }