From: Andrzej Popowski Date: Thu, 26 Nov 2015 15:17:21 +0000 (+0100) Subject: [Download] - refactoring logs X-Git-Tag: submit/tizen_mobile/20151215.080542^2~59^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d5acc3ffe49c6ac1c338f9770263f828f22171b2;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [Download] - refactoring logs Change-Id: Ibab7746ffa8f9fc74b473e2e48bb600ad20a4331 Signed-off-by: Andrzej Popowski --- diff --git a/src/download/download_instance.cc b/src/download/download_instance.cc index b507b094..4ed7c6e5 100755 --- a/src/download/download_instance.cc +++ b/src/download/download_instance.cc @@ -102,101 +102,94 @@ bool DownloadInstance::CheckInstance(DownloadInstance* instance) { common::PlatformResult DownloadInstance::convertError(int err) { char* error = get_error_message(err); - LoggerE("%s",error); switch (err) { case DOWNLOAD_ERROR_INVALID_PARAMETER: - return common::PlatformResult(common::ErrorCode::INVALID_VALUES_ERR, - error); + return LogAndCreateResult(common::ErrorCode::INVALID_VALUES_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_OUT_OF_MEMORY: - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_NETWORK_UNREACHABLE: - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_CONNECTION_TIMED_OUT: - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_NO_SPACE: - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_PERMISSION_DENIED: - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_NOT_SUPPORTED: - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_INVALID_STATE: - return common::PlatformResult(common::ErrorCode::INVALID_VALUES_ERR, - error); + return LogAndCreateResult(common::ErrorCode::INVALID_VALUES_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_CONNECTION_FAILED: - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_INVALID_URL: - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_INVALID_DESTINATION: - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_TOO_MANY_DOWNLOADS: - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_QUEUE_FULL: - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_ALREADY_COMPLETED: - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_FILE_ALREADY_EXISTS: - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_CANNOT_RESUME: - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_FIELD_NOT_FOUND: - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_TOO_MANY_REDIRECTS: - return common::PlatformResult( - common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_UNHANDLED_HTTP_CODE: - return common::PlatformResult( - common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_REQUEST_TIMEOUT: - return common::PlatformResult( - common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_RESPONSE_TIMEOUT: - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_SYSTEM_DOWN: - return common::PlatformResult( - common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_ID_NOT_FOUND: - return common::PlatformResult( - common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_INVALID_NETWORK_TYPE: - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_NO_DATA: - return common::PlatformResult( - common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); case DOWNLOAD_ERROR_IO_ERROR: - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, - error); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, error, + ("Error %d (%s)", err, error)); default: - return common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, - "Unknown error."); + return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "Unknown error.", + ("Unknown error: %d", err)); } } #define CHECK_EXIST(args, name, out) \ if (!args.contains(name)) {\ - ReportError(common::PlatformResult(common::ErrorCode::TYPE_MISMATCH_ERR, name" is required argument"), &out);\ + LogAndReportError(common::PlatformResult(common::ErrorCode::TYPE_MISMATCH_ERR, name" is required argument"), &out);\ return;\ } @@ -300,7 +293,8 @@ gboolean DownloadInstance::OnFinished(void* user_data) { int ret = download_get_downloaded_file_path(downCbPtr->downloadId, &fullPath); if (ret != DOWNLOAD_ERROR_NONE) { - common::tools::ReportError(convertError(ret), &out); + LogAndReportError(convertError(ret), &out, + ("download_get_downloaded_file_path error: %d (%s)", ret, get_error_message(ret))); } else { ret = download_unset_state_changed_cb(diPtr->download_id); if (ret != DOWNLOAD_ERROR_NONE) { @@ -402,14 +396,13 @@ gboolean DownloadInstance::OnFailed(void* user_data) { return FALSE; } - DownloadInstance* instance = downCbPtr->instance; - LoggerD("OnFailed for callbackID %d Called", downCbPtr->callbackId); download_get_error(downCbPtr->downloadId, &error); if (DOWNLOAD_ERROR_NONE != error) { - common::tools::ReportError(convertError(error), &out); + LogAndReportError(convertError(error), &out, + ("download_get_error error: %d (%s)", error, get_error_message(error))); } out["callbackId"] = @@ -501,31 +494,31 @@ void DownloadInstance::DownloadManagerStart network_available = cell_available || wifi_available || ethernet_available; diPtr->network_type = DOWNLOAD_NETWORK_ALL; } else { - LoggerE("The input parameter contains an invalid network type"); - ReportError( + LogAndReportError( common::PlatformResult(common::ErrorCode::INVALID_VALUES_ERR, "The input parameter contains an invalid network type."), - &out); + &out, + ("The input parameter contains an invalid network type: %s", networkType.c_str())); return; } if (!network_support) { - LoggerE("Requested network type (%s) is not supported.", networkType.c_str()); - ReportError( + LogAndReportError( common::PlatformResult(common::ErrorCode::NOT_SUPPORTED_ERR, "The networkType of the given DownloadRequest " "is not supported on this device."), - &out); + &out, + ("Requested network type (%s) is not supported.", networkType.c_str())); return; } if (!network_available) { - LoggerE("Requested network type (%s) is not available.", networkType.c_str()); - ReportError( + LogAndReportError( common::PlatformResult(common::ErrorCode::NETWORK_ERR, "The networkType of the given DownloadRequest " "is currently not available on this device."), - &out); + &out, + ("Requested network type (%s) is not available.", networkType.c_str())); return; } @@ -538,39 +531,39 @@ void DownloadInstance::DownloadManagerStart ret = download_create(&diPtr->download_id); if (ret != DOWNLOAD_ERROR_NONE) { - LoggerE("%s", get_error_message(ret)); - common::tools::ReportError(convertError(ret), &out); + LogAndReportError(convertError(ret), &out, + ("download_create error: %d (%s)", ret, get_error_message(ret))); return; } ret = download_set_state_changed_cb (diPtr->download_id, OnStateChanged, static_cast(downCbPtr)); if (ret != DOWNLOAD_ERROR_NONE) { - LoggerE("%s", get_error_message(ret)); - common::tools::ReportError(convertError(ret), &out); + LogAndReportError(convertError(ret), &out, + ("download_set_state_changed_cb error: %d (%s)", ret, get_error_message(ret))); return; } ret = download_set_progress_cb (diPtr->download_id, progress_changed_cb, static_cast(downCbPtr)); if (ret != DOWNLOAD_ERROR_NONE) { - LoggerE("%s", get_error_message(ret)); - common::tools::ReportError(convertError(ret), &out); + LogAndReportError(convertError(ret), &out, + ("download_set_progress_cb error: %d (%s)", ret, get_error_message(ret))); return; } ret = download_set_url(diPtr->download_id, diPtr->url.c_str()); if (ret != DOWNLOAD_ERROR_NONE) { - LoggerE("%s", get_error_message(ret)); - common::tools::ReportError(convertError(ret), &out); + LogAndReportError(convertError(ret), &out, + ("download_set_url error: %d (%s)", ret, get_error_message(ret))); return; } if (diPtr->destination.size() != 0) { ret = download_set_destination(diPtr->download_id, diPtr->destination.c_str()); if (ret != DOWNLOAD_ERROR_NONE) { - LoggerE("%s", get_error_message(ret)); - common::tools::ReportError(convertError(ret), &out); + LogAndReportError(convertError(ret), &out, + ("download_set_destination error: %d (%s)", ret, get_error_message(ret))); return; } } @@ -578,8 +571,8 @@ void DownloadInstance::DownloadManagerStart if (!diPtr->file_name.empty()) { ret = download_set_file_name(diPtr->download_id, diPtr->file_name.c_str()); if (ret != DOWNLOAD_ERROR_NONE) { - LoggerE("%s", get_error_message(ret)); - common::tools::ReportError(convertError(ret), &out); + LogAndReportError(convertError(ret), &out, + ("download_set_file_name error: %d (%s)", ret, get_error_message(ret))); return; } } @@ -602,8 +595,8 @@ void DownloadInstance::DownloadManagerStart if (ret == DOWNLOAD_ERROR_NONE) { ReportSuccess(out); } else { - LoggerE("%s", get_error_message(ret)); - common::tools::ReportError(convertError(ret), &out); + LogAndReportError(convertError(ret), &out, + ("download_start error: %d (%s)", ret, get_error_message(ret))); } } @@ -616,10 +609,10 @@ void DownloadInstance::DownloadManagerCancel int callbackId = static_cast(args.get("downloadId").get()); if (!GetDownloadID(callbackId, downloadId)) { - LoggerE("The identifier does not match any download operation in progress"); - ReportError(common::PlatformResult(common::ErrorCode::NOT_FOUND_ERR, - "The identifier does not match any download operation in progress"), - &out); + LogAndReportError(common::PlatformResult(common::ErrorCode::NOT_FOUND_ERR, + "The identifier does not match any download operation in progress"), + &out, + ("The identifier %d does not match any download operation in progress", downloadId)); return; } @@ -628,7 +621,8 @@ void DownloadInstance::DownloadManagerCancel if (ret == DOWNLOAD_ERROR_NONE) { ReportSuccess(out); } else { - common::tools::ReportError(convertError(ret), &out); + LogAndReportError(convertError(ret), &out, + ("download_cancel error: %d (%s)", ret, get_error_message(ret))); } } @@ -641,10 +635,10 @@ void DownloadInstance::DownloadManagerPause int callbackId = static_cast(args.get("downloadId").get()); if (!GetDownloadID(callbackId, downloadId)) { - LoggerE("The identifier does not match any download operation in progress"); - ReportError(common::PlatformResult(common::ErrorCode::NOT_FOUND_ERR, - "The identifier does not match any download operation in progress"), - &out); + LogAndReportError(common::PlatformResult(common::ErrorCode::NOT_FOUND_ERR, + "The identifier does not match any download operation in progress"), + &out, + ("The identifier %d does not match any download operation in progress", downloadId)); return; } @@ -653,7 +647,8 @@ void DownloadInstance::DownloadManagerPause if (ret == DOWNLOAD_ERROR_NONE) { ReportSuccess(out); } else { - common::tools::ReportError(convertError(ret), &out); + LogAndReportError(convertError(ret), &out, + ("download_pause error: %d (%s)", ret, get_error_message(ret))); } } @@ -666,9 +661,10 @@ void DownloadInstance::DownloadManagerResume int callbackId = static_cast(args.get("downloadId").get()); if (!GetDownloadID(callbackId, downloadId)) { - ReportError(common::PlatformResult(common::ErrorCode::NOT_FOUND_ERR, - "The identifier does not match any download operation in progress"), - &out); + LogAndReportError(common::PlatformResult(common::ErrorCode::NOT_FOUND_ERR, + "The identifier does not match any download operation in progress"), + &out, + ("The identifier %d does not match any download operation in progress", downloadId)); return; } @@ -677,7 +673,8 @@ void DownloadInstance::DownloadManagerResume if (ret == DOWNLOAD_ERROR_NONE) { ReportSuccess(out); } else { - common::tools::ReportError(convertError(ret), &out); + LogAndReportError(convertError(ret), &out, + ("download_start error: %d (%s)", ret, get_error_message(ret))); } } @@ -692,10 +689,10 @@ void DownloadInstance::DownloadManagerGetstate int callbackId = static_cast(args.get("downloadId").get()); if (!GetDownloadID(callbackId, downloadId)) { - LoggerE("The identifier does not match any download operation in progress"); - ReportError(common::PlatformResult(common::ErrorCode::NOT_FOUND_ERR, - "The identifier does not match any download operation in progress"), - &out); + LogAndReportError(common::PlatformResult(common::ErrorCode::NOT_FOUND_ERR, + "The identifier does not match any download operation in progress"), + &out, + ("The identifier %d does not match any download operation in progress", downloadId)); return; } @@ -730,7 +727,8 @@ void DownloadInstance::DownloadManagerGetstate ReportSuccess(picojson::value(stateValue), out); } else { - common::tools::ReportError(convertError(ret), &out); + LogAndReportError(convertError(ret), &out, + ("download_get_state error: %d (%s)", ret, get_error_message(ret))); } } @@ -745,9 +743,10 @@ void DownloadInstance::DownloadManagerGetmimetype int callbackId = static_cast(args.get("downloadId").get()); if (!GetDownloadID(callbackId, downloadId)) { - ReportError(common::PlatformResult(common::ErrorCode::NOT_FOUND_ERR, - "The identifier does not match any download operation in progress"), - &out); + LogAndReportError(common::PlatformResult(common::ErrorCode::NOT_FOUND_ERR, + "The identifier does not match any download operation in progress"), + &out, + ("The identifier %d does not match any download operation in progress", downloadId)); return; } @@ -756,7 +755,8 @@ void DownloadInstance::DownloadManagerGetmimetype if (ret == DOWNLOAD_ERROR_NONE) { ReportSuccess(picojson::value(mimetype), out); } else { - common::tools::ReportError(convertError(ret), &out); + LogAndReportError(convertError(ret), &out, + ("download_get_mime_type error: %d (%s)", ret, get_error_message(ret))); } free(mimetype); }