From: Andrzej Popowski Date: Mon, 19 Oct 2015 08:57:12 +0000 (+0200) Subject: [Package] - Add error messages X-Git-Tag: submit/tizen/20151026.073646^2^2~8^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6fbb51b560b7b994588a45074fea525fe6933746;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [Package] - Add error messages Change-Id: I82c34434b81357e3a1c021cc08f7e6fdab18686a Signed-off-by: Andrzej Popowski --- diff --git a/src/package/package_info_provider.cc b/src/package/package_info_provider.cc index 9f41455f..2cb344ef 100644 --- a/src/package/package_info_provider.cc +++ b/src/package/package_info_provider.cc @@ -72,9 +72,9 @@ void PackageInfoProvider::GetPackagesInfo( start_time = clock(); picojson::array array_data; - if ( pkgmgrinfo_pkginfo_get_list(PackageInfoGetListCb, &array_data) - != PMINFO_R_OK ) { - LoggerE("Failed to get package information"); + int ret = pkgmgrinfo_pkginfo_get_list(PackageInfoGetListCb, &array_data); + if (ret != PMINFO_R_OK ) { + LoggerE("Failed to get package information: %d (%s)", ret, get_error_message(ret)); REPORT_ERROR(out, UnknownException("Any other platform error occurs")); return; } @@ -112,9 +112,9 @@ void PackageInfoProvider::GetPackageInfo( } pkgmgrinfo_pkginfo_h info; - if ( pkgmgrinfo_pkginfo_get_pkginfo(package_id, &info) - != PMINFO_R_OK ) { - LoggerE("Failed to get pkginfo"); + int ret = pkgmgrinfo_pkginfo_get_pkginfo(package_id, &info); + if (ret != PMINFO_R_OK ) { + LoggerE("Failed to get pkginfo: %d (%s)", ret, get_error_message(ret)); REPORT_ERROR(out, NotFoundException("The package with the specified ID is not found")); return; } @@ -157,7 +157,7 @@ bool PackageInfoProvider:: ConvertToPackageToObject( char* id = NULL; ret = pkgmgrinfo_pkginfo_get_pkgid(info, &id); if ( (ret != PMINFO_R_OK) || (id == NULL) ) { - LoggerE("Failed to get package id"); + LoggerE("Failed to get package id: %d (%s)", ret, get_error_message(ret)); return false; } out["id"] = picojson::value(id); @@ -165,7 +165,7 @@ bool PackageInfoProvider:: ConvertToPackageToObject( char* name = NULL; ret = pkgmgrinfo_pkginfo_get_label(info, &name); if ( (ret != PMINFO_R_OK) || (name == NULL) ) { - LoggerE("[%s] Failed to get package name", id); + LoggerE("[%s] Failed to get package name: %d (%s)", id, ret, get_error_message(ret)); return false; } out["name"] = picojson::value(name); @@ -173,7 +173,7 @@ bool PackageInfoProvider:: ConvertToPackageToObject( char* iconPath = NULL; ret = pkgmgrinfo_pkginfo_get_icon(info, &iconPath); if ( (ret != PMINFO_R_OK) || (iconPath == NULL) ) { - LoggerE("[%s] Failed to get package iconPath", id); + LoggerE("[%s] Failed to get package iconPath: %d (%s)", id, ret, get_error_message(ret)); return false; } out["iconPath"] = picojson::value(iconPath); @@ -181,7 +181,7 @@ bool PackageInfoProvider:: ConvertToPackageToObject( char* version = NULL; ret = pkgmgrinfo_pkginfo_get_version(info, &version); if ( (ret != PMINFO_R_OK) || (version == NULL) ) { - LoggerE("[%s] Failed to get package version", id); + LoggerE("[%s] Failed to get package version: %d (%s)", id, ret, get_error_message(ret)); return false; } out["version"] = picojson::value(version); @@ -189,7 +189,7 @@ bool PackageInfoProvider:: ConvertToPackageToObject( int lastModified = 0; ret = pkgmgrinfo_pkginfo_get_installed_time(info, &lastModified); if ( (ret != PMINFO_R_OK) ) { - LoggerE("[%s] Failed to get package lastModified", id); + LoggerE("[%s] Failed to get package lastModified: %d (%s)", id, ret, get_error_message(ret)); return false; } // This value will be converted into JavaScript Date object @@ -199,7 +199,7 @@ bool PackageInfoProvider:: ConvertToPackageToObject( char* author = NULL; ret = pkgmgrinfo_pkginfo_get_author_name(info, &author); if ( (ret != PMINFO_R_OK) || (author == NULL) ) { - LoggerE("[%s] Failed to get package author", id); + LoggerE("[%s] Failed to get package author: %d (%s)", id, ret, get_error_message(ret)); return false; } out["author"] = picojson::value(author); @@ -207,7 +207,7 @@ bool PackageInfoProvider:: ConvertToPackageToObject( char* description = NULL; ret = pkgmgrinfo_pkginfo_get_description(info, &description); if ( (ret != PMINFO_R_OK) || (description == NULL) ) { - LoggerE("[%s] Failed to get package description", id); + LoggerE("[%s] Failed to get package description: %d (%s)", id, ret, get_error_message(ret)); return false; } out["description"] = picojson::value(description); @@ -215,13 +215,13 @@ bool PackageInfoProvider:: ConvertToPackageToObject( package_info_h package_info; ret = package_info_create(id, &package_info); if ( ret != PACKAGE_MANAGER_ERROR_NONE ) { - LoggerE("Failed to create package info"); + LoggerE("Failed to create package info: %d (%s)", ret, get_error_message(ret)); return false; } SCOPE_EXIT { if (PACKAGE_MANAGER_ERROR_NONE != package_info_destroy(package_info)) { - LoggerE("Failed to destroy package info"); + LoggerE("Failed to destroy package info: %d (%s)", ret, get_error_message(ret)); } }; @@ -229,7 +229,7 @@ bool PackageInfoProvider:: ConvertToPackageToObject( ret = package_info_foreach_app_from_package(package_info, PACKAGE_INFO_ALLAPP, PackageAppInfoCb, &array_data); if ( ret != PACKAGE_MANAGER_ERROR_NONE ) { - LoggerE("Failed to get app info"); + LoggerE("Failed to get app info: %d (%s)", ret, get_error_message(ret)); return false; } out["appIds"] = picojson::value(array_data); @@ -249,6 +249,7 @@ void GetSize(const std::string& id, int service_mode, picojson::object* out) { pkgmgr_client_free(pc); if (size < 0) { + LoggerE("Request service failed: %d (%s)", size, get_error_message(size)); ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to get size"), out); } else { @@ -280,7 +281,7 @@ bool PackageInfoProvider::GetCurrentPackageId( int pid = getpid(); ret = app_manager_get_app_id(pid, &app_id); if ( ret != APP_MANAGER_ERROR_NONE ) { - LoggerE("Failed to get app id"); + LoggerE("Failed to get app id: %d (%s)", ret, get_error_message(ret)); return false; } @@ -288,14 +289,14 @@ bool PackageInfoProvider::GetCurrentPackageId( ret = app_info_create(app_id, &handle); free(app_id); if ( ret != APP_MANAGER_ERROR_NONE ) { - LoggerE("Fail to get app info"); + LoggerE("Fail to get app info: %d (%s)", ret, get_error_message(ret)); return false; } ret = app_info_get_package(handle, package_id); app_info_destroy(handle); if ( (ret != APP_MANAGER_ERROR_NONE) || (*package_id == NULL) ) { - LoggerE("Fail to get pkg id"); + LoggerE("Fail to get pkg id: %d (%s)", ret, get_error_message(ret)); return false; } diff --git a/src/package/package_instance.cc b/src/package/package_instance.cc index e8d0d754..9fffaa88 100644 --- a/src/package/package_instance.cc +++ b/src/package/package_instance.cc @@ -213,19 +213,21 @@ static std::string convertUriToPath(const std::string& uri) { PackageInstance::PackageInstance() { LoggerD("Enter"); - if ( package_manager_request_create(&request_) - != PACKAGE_MANAGER_ERROR_NONE ) { - LoggerE("Failed to created package manager request"); + int ret = package_manager_request_create(&request_); + if (ret != PACKAGE_MANAGER_ERROR_NONE ) { + LoggerE("Failed to created package manager request: %d (%s)", ret, get_error_message(ret)); request_ = NULL; } - if ( package_manager_request_set_event_cb(request_, PackageRequestCb, - static_cast(this)) != PACKAGE_MANAGER_ERROR_NONE ) { - LoggerE("Failed to set request event callback"); + ret = package_manager_request_set_event_cb(request_, PackageRequestCb, + static_cast(this)); + if (ret != PACKAGE_MANAGER_ERROR_NONE ) { + LoggerE("Failed to set request event callback: %d (%s)", ret, get_error_message(ret)); } - if ( package_manager_create(&manager_) != PACKAGE_MANAGER_ERROR_NONE ) { - LoggerE("Failed to created package manager"); + ret = package_manager_create(&manager_); + if (ret != PACKAGE_MANAGER_ERROR_NONE ) { + LoggerE("Failed to created package manager: %d (%s)", ret, get_error_message(ret)); manager_ = NULL; } @@ -320,8 +322,7 @@ void PackageInstance::PackageManagerInstall( NotFoundException( "The package is not found at the specified location")); } else { - LoggerE("It is not allowed to install the package by " \ - "the platform or any other platform error occurs"); + LoggerE("Failed to install package: %d (%s)", ret, get_error_message(ret)); InvokeErrorCallbackAsync(callback_id, UnknownException("It is not allowed to install the package by " \ "the platform or any other platform error occurs")); @@ -361,8 +362,7 @@ void PackageInstance::PackageManagerUninstall( NotFoundException( "The package is not found at the specified location")); } else { - LoggerE("It is not allowed to install the package by the " \ - "platform or any other platform error occurs"); + LoggerE("Failed to uninstall package: %d (%s)", ret, get_error_message(ret)); InvokeErrorCallbackAsync(callback_id, UnknownException( "It is not allowed to install the package by the platform or " \ "any other platform error occurs")); @@ -455,10 +455,10 @@ void PackageInstance:: return; } - if ( package_manager_set_event_cb( - manager_, PackageListenerCb, static_cast(this)) - != PACKAGE_MANAGER_ERROR_NONE ) { - LoggerE("Failed to set event callback"); + int ret = package_manager_set_event_cb( + manager_, PackageListenerCb, static_cast(this)); + if (ret != PACKAGE_MANAGER_ERROR_NONE ) { + LoggerE("Failed to set event callback: %d (%s)", ret, get_error_message(ret)); ReportError( UnknownException("The package list change event cannot be " \ "generated because of a platform error"), @@ -490,9 +490,9 @@ void PackageInstance:: return; } - if ( package_manager_unset_event_cb(manager_) - != PACKAGE_MANAGER_ERROR_NONE ) { - LoggerE("Failed to unset event callback"); + int ret = package_manager_unset_event_cb(manager_); + if (ret != PACKAGE_MANAGER_ERROR_NONE ) { + LoggerE("Failed to unset event callback: %d (%s)", ret, get_error_message(ret)); ReportError( UnknownException("The listener removal request fails" \ "because of a platform error"),