From 55bd622381dff66e97fe3f98aa91c63cc584b8c4 Mon Sep 17 00:00:00 2001 From: "s89.jang" Date: Mon, 27 Mar 2017 20:34:35 +0900 Subject: [PATCH] Refine some log messages Print pkgid or appid at log messages to provide more information. Change-Id: I76997861948c24151ed7428805cd58f31401ec72 Signed-off-by: s89.jang --- .../Tizen.Applications/ApplicationInfo.cs | 28 ++++++++--------- .../Tizen.Applications/ApplicationManager.cs | 2 +- .../Tizen.Applications/Package.cs | 36 +++++++++++----------- .../Tizen.Applications/PackageManager.cs | 18 +++++------ 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/Tizen.Applications.Common/Tizen.Applications/ApplicationInfo.cs b/src/Tizen.Applications.Common/Tizen.Applications/ApplicationInfo.cs index eb5e48e..b08457a 100755 --- a/src/Tizen.Applications.Common/Tizen.Applications/ApplicationInfo.cs +++ b/src/Tizen.Applications.Common/Tizen.Applications/ApplicationInfo.cs @@ -89,7 +89,7 @@ namespace Tizen.Applications err = Interop.ApplicationManager.AppInfoGetPackage(infoHandle, out packageid); if (err != Interop.ApplicationManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get the package id. err = " + err); + Log.Warn(LogTag, "Failed to get the package id of " + _applicationId + ". err = " + err); } } return packageid; @@ -110,7 +110,7 @@ namespace Tizen.Applications err = Interop.ApplicationManager.AppInfoGetLabel(infoHandle, out label); if (err != Interop.ApplicationManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get the label. err = " + err); + Log.Warn(LogTag, "Failed to get the app label of " + _applicationId + ". err = " + err); } } return label; @@ -131,7 +131,7 @@ namespace Tizen.Applications err = Interop.ApplicationManager.AppInfoGetExec(infoHandle, out exec); if (err != Interop.ApplicationManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get the executable file path. err = " + err); + Log.Warn(LogTag, "Failed to get the executable file path of " + _applicationId + ". err = " + err); } } return exec; @@ -152,7 +152,7 @@ namespace Tizen.Applications err = Interop.ApplicationManager.AppInfoGetIcon(infoHandle, out path); if (err != Interop.ApplicationManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get the icon path. err = " + err); + Log.Warn(LogTag, "Failed to get the app icon path of " + _applicationId + ". err = " + err); } } return path; @@ -173,7 +173,7 @@ namespace Tizen.Applications err = Interop.ApplicationManager.AppInfoGetType(infoHandle, out type); if (err != Interop.ApplicationManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get the application type. err = " + err); + Log.Warn(LogTag, "Failed to get the application type of " + _applicationId + ". err = " + err); } } return type; @@ -204,7 +204,7 @@ namespace Tizen.Applications err = Interop.ApplicationManager.AppInfoForeachMetadata(infoHandle, cb, IntPtr.Zero); if (err != Interop.ApplicationManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get metadata of the application. err = " + err); + Log.Warn(LogTag, "Failed to get application metadata of " + _applicationId + ". err = " + err); } } return metadata; @@ -225,7 +225,7 @@ namespace Tizen.Applications err = Interop.ApplicationManager.AppInfoIsNodisplay(infoHandle, out nodisplay); if (err != Interop.ApplicationManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get the IsNoDisplay value. err = " + err); + Log.Warn(LogTag, "Failed to get the IsNoDisplay value of " + _applicationId + ". err = " + err); } } @@ -247,7 +247,7 @@ namespace Tizen.Applications err = Interop.ApplicationManager.AppInfoIsOnBoot(infoHandle, out onboot); if (err != Interop.ApplicationManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get the IsOnBoot value. err = " + err); + Log.Warn(LogTag, "Failed to get the IsOnBoot value of " + _applicationId + ". err = " + err); } } return onboot; @@ -268,7 +268,7 @@ namespace Tizen.Applications err = Interop.ApplicationManager.AppInfoIsPreLoad(infoHandle, out preloaded); if (err != Interop.ApplicationManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get the IsPreload value. err = " + err); + Log.Warn(LogTag, "Failed to get the IsPreload value of " + _applicationId + ". err = " + err); } } return preloaded; @@ -286,7 +286,7 @@ namespace Tizen.Applications err = Interop.ApplicationManager.AppManagerGetSharedDataPath(ApplicationId, out path); if (err != Interop.ApplicationManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get the SharedDataPath. err = " + err); + Log.Warn(LogTag, "Failed to get the SharedDataPath of " + _applicationId + ". err = " + err); } return path; } @@ -303,7 +303,7 @@ namespace Tizen.Applications err = Interop.ApplicationManager.AppManagerGetSharedResourcePath(ApplicationId, out path); if (err != Interop.ApplicationManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get the SharedResourcePath. err = " + err); + Log.Warn(LogTag, "Failed to get the SharedResourcePath of " + _applicationId + ". err = " + err); } return path; } @@ -320,7 +320,7 @@ namespace Tizen.Applications err = Interop.ApplicationManager.AppManagerGetSharedTrustedPath(ApplicationId, out path); if (err != Interop.ApplicationManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get the SharedTrustedPath. err = " + err); + Log.Warn(LogTag, "Failed to get the SharedTrustedPath of " + _applicationId + ". err = " + err); } return path; } @@ -337,7 +337,7 @@ namespace Tizen.Applications err = Interop.ApplicationManager.AppManagerGetExternalSharedDataPath(ApplicationId, out path); if (err != Interop.ApplicationManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get the ExternalSharedDataPath. err = " + err); + Log.Warn(LogTag, "Failed to get the ExternalSharedDataPath of " + _applicationId + ". err = " + err); } return path; } @@ -353,7 +353,7 @@ namespace Tizen.Applications err = Interop.ApplicationManager.AppInfoGetLocaledLabel(ApplicationId, locale, out label); if (err != Interop.ApplicationManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get the GetLocalizedLabel. err = " + err); + Log.Warn(LogTag, "Failed to get the GetLocalizedLabel of " + _applicationId + ". err = " + err); label = Label; } return label; diff --git a/src/Tizen.Applications.Common/Tizen.Applications/ApplicationManager.cs b/src/Tizen.Applications.Common/Tizen.Applications/ApplicationManager.cs index c99c04d..25fe0c7 100755 --- a/src/Tizen.Applications.Common/Tizen.Applications/ApplicationManager.cs +++ b/src/Tizen.Applications.Common/Tizen.Applications/ApplicationManager.cs @@ -311,7 +311,7 @@ namespace Tizen.Applications Interop.ApplicationManager.ErrorCode err = Interop.ApplicationManager.AppManagerGetAppInfo(applicationId, out infoHandle); if (err != Interop.ApplicationManager.ErrorCode.None) { - throw ApplicationManagerErrorFactory.GetException(err, "Failed to get the installed application information."); + throw ApplicationManagerErrorFactory.GetException(err, "Failed to get the installed application information of " + applicationId + "."); } ApplicationInfo app = new ApplicationInfo(infoHandle); return app; diff --git a/src/Tizen.Applications.PackageManager/Tizen.Applications/Package.cs b/src/Tizen.Applications.PackageManager/Tizen.Applications/Package.cs index b589e0c..3326c5a 100644 --- a/src/Tizen.Applications.PackageManager/Tizen.Applications/Package.cs +++ b/src/Tizen.Applications.PackageManager/Tizen.Applications/Package.cs @@ -145,19 +145,19 @@ namespace Tizen.Applications Interop.PackageManager.ErrorCode err = Interop.Package.PackageInfoCreate(Id, out packageInfoHandle); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, string.Format("Failed to create native handle for package info. err = {0}", err)); + Log.Warn(LogTag, string.Format("Failed to create native handle for package info of {0}. err = {1}", Id, err)); } err = Interop.Package.PackageInfoForeachAppInfo(packageInfoHandle, (Interop.Package.AppType)type, cb, IntPtr.Zero); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, string.Format("Failed to application info. err = {0}", err)); + Log.Warn(LogTag, string.Format("Failed to application info of {0}. err = {1}", Id, err)); } err = Interop.Package.PackageInfoDestroy(packageInfoHandle); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, string.Format("Failed to destroy native handle for package info. err = {0}", err)); + Log.Warn(LogTag, string.Format("Failed to destroy native handle for package info of {0}. err = {1}", Id, err)); } return appInfoList; } @@ -182,7 +182,7 @@ namespace Tizen.Applications Interop.PackageManager.ErrorCode err = Interop.PackageManager.PackageManagerGetSizeInfo(Id, sizeInfoCb, IntPtr.Zero); if (err != Interop.PackageManager.ErrorCode.None) { - tcs.TrySetException(PackageManagerErrorFactory.GetException(err, "Failed to get total package size info")); + tcs.TrySetException(PackageManagerErrorFactory.GetException(err, "Failed to get total package size info of " + Id)); } return await tcs.Task.ConfigureAwait(false); } @@ -215,61 +215,61 @@ namespace Tizen.Applications err = Interop.Package.PackageInfoGetLabel(handle, out package._label); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get label for package"); + Log.Warn(LogTag, "Failed to get package label of " + pkgId); } err = Interop.Package.PackageInfoGetIconPath(handle, out package._iconPath); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get label for icon path"); + Log.Warn(LogTag, "Failed to get package icon path of " + pkgId); } err = Interop.Package.PackageInfoGetVersion(handle, out package._version); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get package version"); + Log.Warn(LogTag, "Failed to get package version of " + pkgId); } string type; Interop.Package.PackageInfoGetType(handle, out type); if (Enum.TryParse(type, true, out package._type) == false) { - Log.Warn(LogTag, "Failed to get package type"); + Log.Warn(LogTag, "Failed to get package type of " + pkgId); } err = Interop.Package.PackageInfoGetRootPath(handle, out package._rootPath); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get package root directory"); + Log.Warn(LogTag, "Failed to get package root directory of " + pkgId); } err = Interop.Package.PackageInfoGetTepName(handle, out package._expansionPackageName); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get expansion package name"); + Log.Warn(LogTag, "Failed to get expansion package name of " + pkgId); package._expansionPackageName = string.Empty; } err = Interop.Package.PackageInfoGetInstalledStorage(handle, out package._installedStorageType); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get installed storage type for package"); + Log.Warn(LogTag, "Failed to get installed storage type of " + pkgId); } Interop.Package.PackageInfoIsSystemPackage(handle, out package._isSystemPackage); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get if package is system package"); + Log.Warn(LogTag, "Failed to get whether package " + pkgId + " is system package or not"); } Interop.Package.PackageInfoIsRemovablePackage(handle, out package._isRemovable); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get if package is removable"); + Log.Warn(LogTag, "Failed to get whether package " + pkgId + " is removable or not"); } Interop.Package.PackageInfoIsPreloadPackage(handle, out package._isPreloaded); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get if package is preloaded"); + Log.Warn(LogTag, "Failed to get whether package " + pkgId + " is preloaded or not"); } Interop.Package.PackageInfoIsAccessible(handle, out package._isAccessible); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, "Failed to get if package is accessible"); + Log.Warn(LogTag, "Failed to get whether package " + pkgId + " is accessible or not"); } package._certificates = PackageCertificate.GetPackageCertificates(handle); @@ -283,7 +283,7 @@ namespace Tizen.Applications Interop.PackageManager.ErrorCode err = Interop.Package.PackageInfoCreate(packageId, out packageInfoHandle); if (err != Interop.PackageManager.ErrorCode.None) { - throw PackageManagerErrorFactory.GetException(err, "Failed to create native handle for package info."); + throw PackageManagerErrorFactory.GetException(err, string.Format("Failed to create native handle for package info of {0}", packageId)); } Package package = CreatePackage(packageInfoHandle, packageId); @@ -291,7 +291,7 @@ namespace Tizen.Applications err = Interop.Package.PackageInfoDestroy(packageInfoHandle); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, string.Format("Failed to destroy native handle for package info. err = {0}", err)); + Log.Warn(LogTag, string.Format("Failed to destroy native handle for package info of {0}. err = {1}", packageId, err)); } return package; } @@ -302,7 +302,7 @@ namespace Tizen.Applications Interop.PackageManager.ErrorCode err = Interop.Package.PackageInfoGetPackage(packageInfoHandle, out packageId); if (err != Interop.PackageManager.ErrorCode.None) { - throw PackageManagerErrorFactory.GetException(err, "Failed to get package id fro given package handle."); + throw PackageManagerErrorFactory.GetException(err, "Failed to get package id for given package handle."); } return CreatePackage(packageInfoHandle, packageId); } diff --git a/src/Tizen.Applications.PackageManager/Tizen.Applications/PackageManager.cs b/src/Tizen.Applications.PackageManager/Tizen.Applications/PackageManager.cs index 10f1fae..4eb39d3 100644 --- a/src/Tizen.Applications.PackageManager/Tizen.Applications/PackageManager.cs +++ b/src/Tizen.Applications.PackageManager/Tizen.Applications/PackageManager.cs @@ -184,7 +184,7 @@ namespace Tizen.Applications var err = Interop.PackageManager.PackageManageGetPackageIdByAppId(applicationId, out packageId); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, string.Format("Failed to get package Id. err = {0}", err)); + Log.Warn(LogTag, string.Format("Failed to get package Id of {0}. err = {1}", applicationId, err)); if (err != Interop.PackageManager.ErrorCode.InvalidParameter) { throw PackageManagerErrorFactory.GetException(err, "Failed to get package Id"); @@ -489,7 +489,7 @@ namespace Tizen.Applications var err = Interop.PackageManager.PackageManagerRequestCreate(out RequestHandle); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, string.Format("Failed to create package manager request handle. err = {0}", err)); + Log.Warn(LogTag, string.Format("Failed to install package {0}. Error in creating package manager request handle. err = {1}", packagePath, err)); return false; } @@ -500,7 +500,7 @@ namespace Tizen.Applications err = Interop.PackageManager.PackageManagerRequestSetType(RequestHandle, type.ToString().ToLower()); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, string.Format("Failed to install package. Error in setting request package type. err = {0}", err)); + Log.Warn(LogTag, string.Format("Failed to install package {0}. Error in setting request package type. err = {1}", packagePath, err)); RequestHandle.Dispose(); return false; } @@ -511,7 +511,7 @@ namespace Tizen.Applications err = Interop.PackageManager.PackageManagerRequestSetTepPath(RequestHandle, expansionPackagePath); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, string.Format("Failed to install package. Error in setting request package mode. err = {0}", err)); + Log.Warn(LogTag, string.Format("Failed to install package {0}. Error in setting request package mode. err = {1}", packagePath, err)); RequestHandle.Dispose(); return false; } @@ -528,7 +528,7 @@ namespace Tizen.Applications } else { - Log.Warn(LogTag, string.Format("Failed to install package. err = {0}", err)); + Log.Warn(LogTag, string.Format("Failed to install package {0}. err = {1}", packagePath, err)); RequestHandle.Dispose(); return false; } @@ -538,7 +538,7 @@ namespace Tizen.Applications err = Interop.PackageManager.PackageManagerRequestInstall(RequestHandle, packagePath, out requestId); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, string.Format("Failed to install package. err = {0}", err)); + Log.Warn(LogTag, string.Format("Failed to install package {0}. err = {1}", packagePath, err)); RequestHandle.Dispose(); return false; } @@ -618,7 +618,7 @@ namespace Tizen.Applications var err = Interop.PackageManager.PackageManagerRequestCreate(out RequestHandle); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, string.Format("Failed to create package manager request handle. err = {0}", err)); + Log.Warn(LogTag, string.Format("Failed to uninstall package {0}. Error in creating package manager request handle. err = {1}", packageId, err)); return false; } @@ -627,7 +627,7 @@ namespace Tizen.Applications err = Interop.PackageManager.PackageManagerRequestSetType(RequestHandle, type.ToString().ToLower()); if (err != Interop.PackageManager.ErrorCode.None) { - Log.Warn(LogTag, string.Format("Failed to uninstall package. Error in setting request package type. err = {0}", err)); + Log.Warn(LogTag, string.Format("Failed to uninstall package {0}. Error in setting request package type. err = {1}", packageId, err)); RequestHandle.Dispose(); return false; } @@ -643,7 +643,7 @@ namespace Tizen.Applications } else { - Log.Warn(LogTag, string.Format("Failed to uninstall package. err = {0}", err)); + Log.Warn(LogTag, string.Format("Failed to uninstall package {0}. err = {1}", packageId, err)); RequestHandle.Dispose(); return false; } -- 2.7.4