From f89dc41d665fa64be5fb7d5d4fdf0f7ab3118714 Mon Sep 17 00:00:00 2001 From: chensihan Date: Fri, 10 Jan 2025 09:56:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=B4=E6=B5=8B=E6=97=A5?= =?UTF-8?q?=E5=BF=97=20Signed-off-by:=20chensihan=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interfaces/kits/js/backup/session_backup_n_exporter.cpp | 9 ++++++--- .../js/backup/session_incremental_backup_n_exporter.cpp | 9 ++++++--- interfaces/kits/js/backup/session_restore_n_exporter.cpp | 9 ++++++--- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/interfaces/kits/js/backup/session_backup_n_exporter.cpp b/interfaces/kits/js/backup/session_backup_n_exporter.cpp index 54511d2f0..45f2a505b 100644 --- a/interfaces/kits/js/backup/session_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_backup_n_exporter.cpp @@ -51,13 +51,15 @@ static void OnFileReady(weak_ptr pCallbacks, const BFileInfo & ErrCode errCode = BError::GetCodeByErrno(sysErrno); std::string errMsg = "system errno: " + to_string(sysErrno); std::tuple errInfo = std::make_tuple(errCode, errMsg); - HILOGI("callback function backup onFileReady begin errcode: %{public}d", std::get<0>(errInfo)); + HILOGI("callback function backup onFileReady begin errCode: %{public}d, bundle: %{public}s, file: %{public}s", + std::get<0>(errInfo), fileInfo.owner.c_str(), GetAnonyPath(fileInfo.fileName).c_str()); auto cbCompl = [bundleName {fileInfo.owner}, fileName {fileInfo.fileName}, fd {make_shared(fd.Release())}, errInfo](napi_env env, NError err) -> NVal { if (err) { return {env, err.GetNapiErr(env)}; } - HILOGI("callback function backup onFileReady cbCompl errcode: %{public}d", std::get<0>(errInfo)); + HILOGI("callback function backup onFileReady errCode: %{public}d, bundle: %{public}s, file: %{public}s", + std::get<0>(errInfo), bundleName.c_str(), GetAnonyPath(fileName).c_str()); NVal obj; ErrParam errorParam = [ errInfo ]() { return errInfo; @@ -78,7 +80,8 @@ static void OnFileReady(weak_ptr pCallbacks, const BFileInfo & NVal::DeclareNapiProperty(BConstants::URI.c_str(), NVal::CreateUTF8String(env, fileName).val_), NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd->Release()).val_)}); } - HILOGI("callback function backup onFileReady cbCompl end errcode: %{public}d", std::get<0>(errInfo)); + HILOGI("callback function backup onFileReady end errCode: %{public}d, bundle: %{public}s, file: %{public}s", + std::get<0>(errInfo), bundleName.c_str(), GetAnonyPath(fileName).c_str()); return {obj}; }; diff --git a/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp b/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp index 28f3d100c..691fcda65 100644 --- a/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp @@ -53,14 +53,16 @@ static void OnFileReady(weak_ptr pCallbacks, const BFileInfo & } ErrCode errCode = BError::GetCodeByErrno(sysErrno); std::tuple errInfo = std::make_tuple(errCode, "system errno: " + to_string(sysErrno)); - HILOGI("callback function incremental backup onFileReady cbCompl begin errcode: %{public}d", std::get<0>(errInfo)); + HILOGI("callback function incre backup onFileReady begin errCode: %{public}d, bundle: %{public}s, file: %{public}s", + std::get<0>(errInfo), fileInfo.owner.c_str(), GetAnonyPath(fileInfo.fileName).c_str()); auto cbCompl = [bundleName {fileInfo.owner}, fileName {fileInfo.fileName}, fd {make_shared(fd.Release())}, manifestFd {make_shared(manifestFd.Release())}, errInfo](napi_env env, NError err) -> NVal { if (err) { return {env, err.GetNapiErr(env)}; } - HILOGI("callback function incremental backup onFileReady cbCompl errcode: %{public}d", std::get<0>(errInfo)); + HILOGI("callback function incre backup onFileReady errCode: %{public}d, bundle: %{public}s, file: %{public}s", + std::get<0>(errInfo), bundleName.c_str(), GetAnonyPath(fileName).c_str()); NVal obj; ErrParam errorParam = [ errInfo ]() { return errInfo; @@ -82,7 +84,8 @@ static void OnFileReady(weak_ptr pCallbacks, const BFileInfo & NVal::DeclareNapiProperty(BConstants::MANIFEST_FD.c_str(), NVal::CreateInt32(env, manifestFd->Release()).val_)}); } - HILOGI("callback function incremental backup onFileReady end errcode: %{public}d", std::get<0>(errInfo)); + HILOGI("callback function incre backup onFileReady end errCode:%{public}d, bundle:%{public}s, file:%{public}s", + std::get<0>(errInfo), bundleName.c_str(), GetAnonyPath(fileName).c_str()); return {obj}; }; diff --git a/interfaces/kits/js/backup/session_restore_n_exporter.cpp b/interfaces/kits/js/backup/session_restore_n_exporter.cpp index 9aa6169d2..23df85f3d 100644 --- a/interfaces/kits/js/backup/session_restore_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_restore_n_exporter.cpp @@ -55,14 +55,16 @@ static void OnFileReadySheet(weak_ptr pCallbacks, const BFileI } ErrCode errCode = BError::GetCodeByErrno(sysErrno); std::tuple errInfo = std::make_tuple(errCode, "system errno: " + to_string(sysErrno)); - HILOGI("callback function restore onFileReadySheet begin errCode: %{public}d", std::get<0>(errInfo)); + HILOGI("callback function restore onFileReadySheet begin errCode: %{public}d, bundle: %{public}s, file: %{public}s", + std::get<0>(errInfo), fileInfo.owner.c_str(), GetAnonyPath(fileInfo.fileName).c_str()); auto cbCompl = [bundleName {fileInfo.owner}, fileName {fileInfo.fileName}, fd {make_shared(fd.Release())}, manifestFd {make_shared(manifestFd.Release())}, errInfo](napi_env env, NError err) -> NVal { if (err) { return {env, err.GetNapiErr(env)}; } - HILOGI("callback function restore OnFileReadySheet errCode: %{public}d", std::get<0>(errInfo)); + HILOGI("callback function restore OnFileReadySheet errCode: %{public}d, bundle: %{public}s, file: %{public}s", + std::get<0>(errInfo), bundleName.c_str(), GetAnonyPath(fileName).c_str()); NVal obj; ErrParam errorParam = [ errInfo ]() { return errInfo; @@ -84,7 +86,8 @@ static void OnFileReadySheet(weak_ptr pCallbacks, const BFileI NVal::DeclareNapiProperty(BConstants::MANIFEST_FD.c_str(), NVal::CreateInt32(env, manifestFd->Release()).val_)}); } - HILOGI("callback function restore onFileReadySheet end errCode: %{public}d", std::get<0>(errInfo)); + HILOGI("callback function restore onFileReadySheet end errCode:%{public}d, bundle:%{public}s, file:%{public}s", + std::get<0>(errInfo), bundleName.c_str(), GetAnonyPath(fileName).c_str()); return {obj}; }; -- Gitee