diff --git a/frameworks/js/napi/src/ans_template.cpp b/frameworks/js/napi/src/ans_template.cpp index 372ab0ec2afa3e8536be8852aaac46ffd9950c89..4582766e72282afcadec17509cb7ee4b24a430df 100644 --- a/frameworks/js/napi/src/ans_template.cpp +++ b/frameworks/js/napi/src/ans_template.cpp @@ -107,6 +107,7 @@ napi_value IsSupportTemplate(napi_env env, napi_callback_info info) napi_get_boolean(env, asyncCallbackinfo->params.support, &result); Common::ReturnCallbackPromise(env, asyncCallbackinfo->info, result); if (asyncCallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete isSupportTemplate callback reference."); napi_delete_reference(env, asyncCallbackinfo->info.callback); } napi_delete_async_work(env, asyncCallbackinfo->asyncWork); @@ -119,8 +120,9 @@ napi_value IsSupportTemplate(napi_env env, napi_callback_info info) napi_status status = napi_queue_async_work_with_qos(env, asyncCallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue isSupportTemplate work failed return: %{public}d", status); if (asyncCallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete isSupportTemplate callback reference."); napi_delete_reference(env, asyncCallbackinfo->info.callback); } napi_delete_async_work(env, asyncCallbackinfo->asyncWork); diff --git a/frameworks/js/napi/src/manager/napi_cancel.cpp b/frameworks/js/napi/src/manager/napi_cancel.cpp index 6ad0734317be1625f4435514a28329c6db688e4b..29268a7fb38dad53f723dfd3811dbfbbfe08a7b8 100644 --- a/frameworks/js/napi/src/manager/napi_cancel.cpp +++ b/frameworks/js/napi/src/manager/napi_cancel.cpp @@ -72,10 +72,11 @@ napi_value NapiCancel(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("Queue NapiCancel work failed return: %{public}d", status); + ANS_LOGE("Queue napiCancel work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiCancel callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -143,6 +144,7 @@ napi_value NapiCancelAll(napi_env env, napi_callback_info info) asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiCancelAll callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -214,6 +216,7 @@ napi_value NapiCancelGroup(napi_env env, napi_callback_info info) asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiCancelGroup callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); diff --git a/frameworks/js/napi/src/manager/napi_display_badge.cpp b/frameworks/js/napi/src/manager/napi_display_badge.cpp index 3a50bd00b95453454fb9c8b4051432c3055e995a..a007519548d562aebb1e7ce8e5d494b224339722 100644 --- a/frameworks/js/napi/src/manager/napi_display_badge.cpp +++ b/frameworks/js/napi/src/manager/napi_display_badge.cpp @@ -46,7 +46,7 @@ napi_value NapiDisplayBadge(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("DisplayBadge napi_create_async_work start"); + ANS_LOGI("NapiDisplayBadge work excute."); AsyncCallbackInfoEnableBadge *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { ANS_LOGI("option.bundle = %{public}s option.uid = %{public}d enable = %{public}d", @@ -59,7 +59,7 @@ napi_value NapiDisplayBadge(napi_env env, napi_callback_info info) } }, [](napi_env env, napi_status status, void *data) { - ANS_LOGI("DisplayBadge napi_create_async_work end"); + ANS_LOGI("NapiDisplayBadge work complete."); AsyncCallbackInfoEnableBadge *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); @@ -78,10 +78,11 @@ napi_value NapiDisplayBadge(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiDisplayBadge work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiDisplayBadge callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -142,7 +143,7 @@ napi_value NapiIsBadgeDisplayed(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("IsBadgeDisplayed napi_create_async_work start"); + ANS_LOGI("NapiIsBadgeDisplayed work excute."); AsyncCallbackInfoIsDisplayBadge *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { if (asynccallbackinfo->params.hasBundleOption) { @@ -166,10 +167,11 @@ napi_value NapiIsBadgeDisplayed(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiIsBadgeDisplayed work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiIsBadgeDisplayed callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -261,7 +263,7 @@ napi_value NapiSetBadgeNumber(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("SetBadgeNumber napi_create_async_work start"); + ANS_LOGI("NapiSetBadgeNumber work excute."); AsyncCallbackSetBadgeNumber *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { ANS_LOGI("option.badgeNumber: %{public}d", asynccallbackinfo->params.badgeNumber); @@ -276,10 +278,11 @@ napi_value NapiSetBadgeNumber(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiSetBadgeNumber work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiSetBadgeNumber callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); diff --git a/frameworks/js/napi/src/manager/napi_distributed.cpp b/frameworks/js/napi/src/manager/napi_distributed.cpp index 01706f0d1c154eef379183cdc705c78d2653a8fe..16e6f660a174711cc7e68798f72208eb35c6a8fa 100644 --- a/frameworks/js/napi/src/manager/napi_distributed.cpp +++ b/frameworks/js/napi/src/manager/napi_distributed.cpp @@ -72,7 +72,7 @@ napi_value NapiIsDistributedEnabled(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("IsDistributedEnabled napi_create_async_work start"); + ANS_LOGI("NapiIsDistributedEnabled work excute."); AsyncCallbackInfoIsEnabled *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { @@ -88,10 +88,11 @@ napi_value NapiIsDistributedEnabled(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiIsDistributedEnabled work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiIsDistributedEnabled callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -132,7 +133,7 @@ napi_value NapiEnableDistributed(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("EnableDistributed napi_create_async_work start"); + ANS_LOGI("NapiEnableDistributed work excute."); AsyncCallbackInfoEnabled *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { @@ -141,7 +142,7 @@ napi_value NapiEnableDistributed(napi_env env, napi_callback_info info) } }, [](napi_env env, napi_status status, void *data) { - ANS_LOGI("EnableDistributed napi_create_async_work end"); + ANS_LOGI("NapiEnableDistributed work complete."); AsyncCallbackInfoEnabled *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); @@ -160,10 +161,11 @@ napi_value NapiEnableDistributed(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiEnableDistributed work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiEnableDistributed callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -204,7 +206,7 @@ napi_value NapiEnableDistributedByBundle(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("EnableDistributedByBundle napi_create_async_work start"); + ANS_LOGI("NapiEnableDistributedByBundle work excute."); AsyncCallbackInfoEnabledByBundle *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { asynccallbackinfo->info.errorCode = NotificationHelper::EnableDistributedByBundle( @@ -212,7 +214,7 @@ napi_value NapiEnableDistributedByBundle(napi_env env, napi_callback_info info) } }, [](napi_env env, napi_status status, void *data) { - ANS_LOGI("EnableDistributedByBundle napi_create_async_work end"); + ANS_LOGI("NapiEnableDistributedByBundle work complete."); AsyncCallbackInfoEnabledByBundle *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); @@ -231,10 +233,11 @@ napi_value NapiEnableDistributedByBundle(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiEnableDistributedByBundle work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiEnableDistributedByBundle callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -275,16 +278,16 @@ napi_value NapiEnableDistributedSelf(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("EnableDistributedSelf napi_create_async_work start"); + ANS_LOGI("NapiEnableDistributedSelf work excute."); auto asynccallbackinfo = reinterpret_cast(data); if (asynccallbackinfo) { asynccallbackinfo->info.errorCode = NotificationHelper::EnableDistributedSelf(asynccallbackinfo->params.enable); - ANS_LOGI("EnableDistributedSelf enable = %{public}d", asynccallbackinfo->params.enable); + ANS_LOGI("enable = %{public}d", asynccallbackinfo->params.enable); } }, [](napi_env env, napi_status status, void *data) { - ANS_LOGI("EnableDistributedSelf napi_create_async_work end"); + ANS_LOGI("NapiEnableDistributedSelf work complete."); auto asynccallbackinfo = reinterpret_cast(data); if (asynccallbackinfo) { Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); @@ -303,10 +306,11 @@ napi_value NapiEnableDistributedSelf(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiEnableDistributedSelf work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiEnableDistributedSelf callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -374,7 +378,7 @@ napi_value NapiIsDistributedEnableByBundle(napi_env env, napi_callback_info info nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("IsDistributedEnableByBundle napi_create_async_work start"); + ANS_LOGI("NapiIsDistributedEnableByBundle work excute."); auto asynccallbackinfo = reinterpret_cast(data); if (asynccallbackinfo) { asynccallbackinfo->info.errorCode = NotificationHelper::IsDistributedEnableByBundle( @@ -388,10 +392,11 @@ napi_value NapiIsDistributedEnableByBundle(napi_env env, napi_callback_info info bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiIsDistributedEnableByBundle work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiIsDistributedEnableByBundle callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -463,7 +468,7 @@ napi_value NapiGetDeviceRemindType(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("GetDeviceRemindType napi_create_async_work start"); + ANS_LOGI("NapiGetDeviceRemindType work excute."); auto asynccallbackinfo = reinterpret_cast(data); if (asynccallbackinfo) { asynccallbackinfo->info.errorCode = @@ -477,10 +482,11 @@ napi_value NapiGetDeviceRemindType(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiGetDeviceRemindType work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiGetDeviceRemindType callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -521,7 +527,7 @@ napi_value NapiSetSyncNotificationEnabledWithoutApp(napi_env env, napi_callback_ nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("SetSyncNotificationEnabledWithoutApp napi_create_async_work start"); + ANS_LOGI("NapiSetSyncNotificationEnabledWithoutApp work excute."); AsyncCallbackInfoEnabledWithoutApp *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { @@ -530,7 +536,7 @@ napi_value NapiSetSyncNotificationEnabledWithoutApp(napi_env env, napi_callback_ } }, [](napi_env env, napi_status status, void *data) { - ANS_LOGI("SetSyncNotificationEnabledWithoutApp napi_create_async_work end"); + ANS_LOGI("NapiSetSyncNotificationEnabledWithoutApp work complete."); AsyncCallbackInfoEnabledWithoutApp *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { @@ -550,10 +556,11 @@ napi_value NapiSetSyncNotificationEnabledWithoutApp(napi_env env, napi_callback_ bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiSetSyncNotificationEnabledWithoutApp work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiSetSyncNotificationEnabledWithoutApp callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -595,7 +602,7 @@ napi_value NapiGetSyncNotificationEnabledWithoutApp(napi_env env, napi_callback_ nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("GetSyncNotificationEnabledWithoutApp napi_create_async_work start"); + ANS_LOGI("NapiGetSyncNotificationEnabledWithoutApp work excute."); AsyncCallbackInfoGetEnabledWithoutApp *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { @@ -604,7 +611,7 @@ napi_value NapiGetSyncNotificationEnabledWithoutApp(napi_env env, napi_callback_ } }, [](napi_env env, napi_status status, void *data) { - ANS_LOGI("GetSyncNotificationEnabledWithoutApp napi_create_async_work end"); + ANS_LOGI("NapiGetSyncNotificationEnabledWithoutApp work complete."); AsyncCallbackInfoGetEnabledWithoutApp *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { @@ -630,10 +637,11 @@ napi_value NapiGetSyncNotificationEnabledWithoutApp(napi_env env, napi_callback_ bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiGetSyncNotificationEnabledWithoutApp work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiGetSyncNotificationEnabledWithoutApp callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); diff --git a/frameworks/js/napi/src/manager/napi_disturb_mode.cpp b/frameworks/js/napi/src/manager/napi_disturb_mode.cpp index 979ef175ad92fe34627b2ce705ecb58c2671a600..0a979958418bd943d418eb573f8f76b449ed854f 100644 --- a/frameworks/js/napi/src/manager/napi_disturb_mode.cpp +++ b/frameworks/js/napi/src/manager/napi_disturb_mode.cpp @@ -42,7 +42,7 @@ napi_value NapiSetDoNotDisturbDate(napi_env env, napi_callback_info info) // Asynchronous function call napi_create_async_work(env, nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("SetDoNotDisturbDate napi_create_async_work start"); + ANS_LOGI("NapiSetDoNotDisturbDate work excute."); AsyncCallbackInfoSetDoNotDisturb *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { if (asynccallbackinfo->params.hasUserId) { @@ -53,18 +53,18 @@ napi_value NapiSetDoNotDisturbDate(napi_env env, napi_callback_info info) asynccallbackinfo->params.date); } - ANS_LOGI("SetDoNotDisturbDate date=%{public}s errorCode=%{public}d, hasUserId=%{public}d", + ANS_LOGI("date=%{public}s errorCode=%{public}d, hasUserId=%{public}d", asynccallbackinfo->params.date.Dump().c_str(), asynccallbackinfo->info.errorCode, asynccallbackinfo->params.hasUserId); } }, [](napi_env env, napi_status status, void *data) { - ANS_LOGI("SetDoNotDisturbDate napi_create_async_work end"); + ANS_LOGI("NapiSetDoNotDisturbDate work complete."); AsyncCallbackInfoSetDoNotDisturb *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { - ANS_LOGD("Delete NapiSetDoNotDisturbDate callback reference."); + ANS_LOGD("Delete napiSetDoNotDisturbDate callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -77,10 +77,11 @@ napi_value NapiSetDoNotDisturbDate(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiSetDoNotDisturbDate work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiSetDoNotDisturbDate callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -158,7 +159,7 @@ napi_value NapiGetDoNotDisturbDate(napi_env env, napi_callback_info info) NotificationHelper::GetDoNotDisturbDate(asynccallbackinfo->date); } - ANS_LOGI("GetDoNotDisturbDate errorCode=%{public}d date=%{public}s, hasUserId=%{public}d", + ANS_LOGI("errorCode=%{public}d date=%{public}s, hasUserId=%{public}d", asynccallbackinfo->info.errorCode, asynccallbackinfo->date.Dump().c_str(), asynccallbackinfo->params.hasUserId); } @@ -170,10 +171,11 @@ napi_value NapiGetDoNotDisturbDate(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiGetDoNotDisturbDate work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiGetDoNotDisturbDate callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -215,18 +217,18 @@ napi_value NapiSupportDoNotDisturbMode(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("SupportDoNotDisturbMode napi_create_async_work start"); + ANS_LOGI("NapiSupportDoNotDisturbMode work excute."); AsyncCallbackInfoSupportDoNotDisturb *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { asynccallbackinfo->info.errorCode = NotificationHelper::DoesSupportDoNotDisturbMode(asynccallbackinfo->isSupported); - ANS_LOGI("SupportDoNotDisturbMode errorCode=%{public}d isSupported=%{public}d", + ANS_LOGI("errorCode=%{public}d isSupported=%{public}d", asynccallbackinfo->info.errorCode, asynccallbackinfo->isSupported); } }, [](napi_env env, napi_status status, void *data) { - ANS_LOGI("SupportDoNotDisturbMode napi_create_async_work end"); + ANS_LOGI("NapiSupportDoNotDisturbMode work complete."); AsyncCallbackInfoSupportDoNotDisturb *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { @@ -234,7 +236,7 @@ napi_value NapiSupportDoNotDisturbMode(napi_env env, napi_callback_info info) napi_get_boolean(env, asynccallbackinfo->isSupported, &result); Common::CreateReturnValue(env, asynccallbackinfo->info, result); if (asynccallbackinfo->info.callback != nullptr) { - ANS_LOGD("Delete NapiSupportDoNotDisturbMode callback reference."); + ANS_LOGD("Delete napiSupportDoNotDisturbMode callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -248,10 +250,11 @@ napi_value NapiSupportDoNotDisturbMode(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiSupportDoNotDisturbMode work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiSupportDoNotDisturbMode callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); diff --git a/frameworks/js/napi/src/manager/napi_enable_notification.cpp b/frameworks/js/napi/src/manager/napi_enable_notification.cpp index 65e5ea3c5ff6ee08897b53583c155451416f1b47..a8c5d39c08cf9d3812502a5e56acd5b4202dc996 100644 --- a/frameworks/js/napi/src/manager/napi_enable_notification.cpp +++ b/frameworks/js/napi/src/manager/napi_enable_notification.cpp @@ -33,6 +33,7 @@ void AsyncCompleteCallbackNapiEnableNotification(napi_env env, napi_status statu if (asynccallbackinfo) { Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiEnableNotification callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -65,7 +66,7 @@ napi_value NapiEnableNotification(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("EnableNotification napi_create_async_work start"); + ANS_LOGI("NapiEnableNotification work excute."); AsyncCallbackInfoEnable *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { std::string deviceId {""}; @@ -81,10 +82,11 @@ napi_value NapiEnableNotification(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiEnableNotification work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiEnableNotification callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -144,7 +146,7 @@ napi_value NapiIsNotificationEnabled(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("IsNotificationEnabled napi_create_async_work start"); + ANS_LOGI("NapiIsNotificationEnabled work excute."); AsyncCallbackInfoIsEnable *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { if (asynccallbackinfo->params.hasBundleOption) { @@ -172,10 +174,11 @@ napi_value NapiIsNotificationEnabled(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiIsNotificationEnabled work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiIsNotificationEnabled callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -214,7 +217,7 @@ napi_value NapiIsNotificationEnabledSelf(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("IsNotificationEnabledSelf napi_create_async_work start"); + ANS_LOGI("NapiIsNotificationEnabledSelf work excute."); AsyncCallbackInfoIsEnable *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { if (asynccallbackinfo->params.hasBundleOption) { @@ -234,10 +237,11 @@ napi_value NapiIsNotificationEnabledSelf(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiIsNotificationEnabledSelf work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiIsNotificationEnabledSelf callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -274,7 +278,7 @@ napi_value NapiRequestEnableNotification(napi_env env, napi_callback_info info) // Asynchronous function call napi_create_async_work(env, nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("RequestEnableNotification napi_create_async_work start"); + ANS_LOGI("NapiRequestEnableNotification work excute."); AsyncCallbackInfoIsEnable *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { std::string deviceId {""}; @@ -294,10 +298,11 @@ napi_value NapiRequestEnableNotification(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiRequestEnableNotification work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiRequestEnableNotification callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); diff --git a/frameworks/js/napi/src/manager/napi_get_active.cpp b/frameworks/js/napi/src/manager/napi_get_active.cpp index d3d2e6252de627bc73d38b2b036deb5e05621a78..c7eb7af4ca848324db964c5221cba457f66543dc 100644 --- a/frameworks/js/napi/src/manager/napi_get_active.cpp +++ b/frameworks/js/napi/src/manager/napi_get_active.cpp @@ -93,7 +93,7 @@ napi_value NapiGetAllActiveNotifications(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("GetAllActiveNotifications napi_create_async_work start"); + ANS_LOGI("NapiGetAllActiveNotifications work excute."); auto asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { asynccallbackinfo->info.errorCode = @@ -107,10 +107,11 @@ napi_value NapiGetAllActiveNotifications(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiGetAllActiveNotifications work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiGetAllActiveNotifications callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -198,7 +199,7 @@ napi_value NapiGetActiveNotifications(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("GetActiveNotifications napi_create_async_work start"); + ANS_LOGI("NapiGetActiveNotifications work excute."); auto asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { asynccallbackinfo->info.errorCode = @@ -212,10 +213,11 @@ napi_value NapiGetActiveNotifications(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiGetActiveNotifications work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiGetActiveNotifications callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -248,7 +250,7 @@ void AsyncCompleteCallbackNapiGetActiveNotificationCount(napi_env env, napi_stat } Common::CreateReturnValue(env, asynccallbackinfo->info, result); if (asynccallbackinfo->info.callback != nullptr) { - ANS_LOGD("Delete NapiGetActiveNotificationCount callback reference."); + ANS_LOGD("Delete napiGetActiveNotificationCount callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -281,12 +283,12 @@ napi_value NapiGetActiveNotificationCount(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("GetActiveNotificationCount napi_create_async_work start"); + ANS_LOGI("NapiGetActiveNotificationCount work excute."); auto asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { asynccallbackinfo->info.errorCode = NotificationHelper::GetActiveNotificationNums(asynccallbackinfo->num); - ANS_LOGI("GetActiveNotificationCount count = %{public}" PRIu64 "", asynccallbackinfo->num); + ANS_LOGI("count = %{public}" PRIu64 "", asynccallbackinfo->num); } }, AsyncCompleteCallbackNapiGetActiveNotificationCount, @@ -296,10 +298,11 @@ napi_value NapiGetActiveNotificationCount(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiGetActiveNotificationCount work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiGetActiveNotificationCount callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); diff --git a/frameworks/js/napi/src/manager/napi_publish.cpp b/frameworks/js/napi/src/manager/napi_publish.cpp index 714e5de018b78f119a45e6b872bc12f69259d205..6f630db412bbaab187d7d2f7c13d1357efdfdc9d 100644 --- a/frameworks/js/napi/src/manager/napi_publish.cpp +++ b/frameworks/js/napi/src/manager/napi_publish.cpp @@ -45,10 +45,10 @@ napi_value NapiPublish(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("Publish napi_create_async_work start"); + ANS_LOGI("NapiPublish work excute."); AsyncCallbackInfoPublish *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { - ANS_LOGI("Publish napi_create_async_work start notificationId = %{public}d, contentType = " + ANS_LOGI("notificationId = %{public}d, contentType = " "%{public}d", asynccallbackinfo->request.GetNotificationId(), asynccallbackinfo->request.GetContent()->GetContentType()); @@ -58,7 +58,7 @@ napi_value NapiPublish(napi_env env, napi_callback_info info) } }, [](napi_env env, napi_status status, void *data) { - ANS_LOGI("Publish napi_create_async_work complete start"); + ANS_LOGI("NapiPublish work complete."); AsyncCallbackInfoPublish *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); @@ -78,10 +78,11 @@ napi_value NapiPublish(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiPublish work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiPublish callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -187,10 +188,10 @@ napi_value NapiPublishAsBundle(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("PublishAsBundle napi_create_async_work start"); + ANS_LOGI("NapiPublishAsBundle work excute."); AsyncCallbackInfoPublish *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { - ANS_LOGI("PublishAsBundle napi_create_async_work start notificationId = %{public}d, contentType = " + ANS_LOGI("notificationId = %{public}d, contentType = " "%{public}d", asynccallbackinfo->request.GetNotificationId(), asynccallbackinfo->request.GetContent()->GetContentType()); @@ -200,7 +201,7 @@ napi_value NapiPublishAsBundle(napi_env env, napi_callback_info info) } }, [](napi_env env, napi_status status, void *data) { - ANS_LOGI("PublishAsBundle napi_create_async_work complete start"); + ANS_LOGI("NapiPublishAsBundle work complete."); AsyncCallbackInfoPublish *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); @@ -220,10 +221,11 @@ napi_value NapiPublishAsBundle(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiPublishAsBundle work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiPublishAsBundle callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); diff --git a/frameworks/js/napi/src/manager/napi_remove_group.cpp b/frameworks/js/napi/src/manager/napi_remove_group.cpp index 91734aa74f1734eb68a566f5acf3aaff432b6205..aa20ecf8e0471e580c5fabf91a84e14d977c56f0 100644 --- a/frameworks/js/napi/src/manager/napi_remove_group.cpp +++ b/frameworks/js/napi/src/manager/napi_remove_group.cpp @@ -94,6 +94,7 @@ void AsyncCompleteCallbackNapiRemoveGroupByBundle(napi_env env, napi_status stat if (asynccallbackinfo) { Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiRemoveGroupByBundle callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -126,7 +127,7 @@ napi_value NapiRemoveGroupByBundle(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("RemoveGroupByBundle napi_create_async_work start"); + ANS_LOGI("NapiRemoveGroupByBundle work excute."); AsyncCallbackInfoRemoveGroupByBundle *asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { @@ -145,10 +146,11 @@ napi_value NapiRemoveGroupByBundle(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiRemoveGroupByBundle work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiRemoveGroupByBundle callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); diff --git a/frameworks/js/napi/src/manager/napi_slot.cpp b/frameworks/js/napi/src/manager/napi_slot.cpp index f77a77b677f35be1c850562988bf150cd8d379fd..6d393c374b300f1e2827a496eb43542535124f28 100644 --- a/frameworks/js/napi/src/manager/napi_slot.cpp +++ b/frameworks/js/napi/src/manager/napi_slot.cpp @@ -49,7 +49,7 @@ napi_value NapiAddSlot(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("AddSlot napi_create_async_work start"); + ANS_LOGI("NapiAddSlot work excute."); auto asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { if (asynccallbackinfo->isAddSlotByType) { @@ -61,7 +61,7 @@ napi_value NapiAddSlot(napi_env env, napi_callback_info info) } }, [](napi_env env, napi_status status, void *data) { - ANS_LOGI("AddSlot napi_create_async_work end"); + ANS_LOGI("NapiAddSlot work complete."); auto asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); @@ -80,10 +80,11 @@ napi_value NapiAddSlot(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiAddSlot work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiAddSlot callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -122,19 +123,19 @@ napi_value NapiAddSlots(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("AddSlots napi_create_async_work start"); + ANS_LOGI("NapiAddSlots work excute."); auto asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { asynccallbackinfo->info.errorCode = NotificationHelper::AddNotificationSlots(asynccallbackinfo->slots); } }, [](napi_env env, napi_status status, void *data) { - ANS_LOGI("AddSlots napi_create_async_work end"); + ANS_LOGI("NapiAddSlots work complete."); auto asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { - ANS_LOGD("Delete NapiAddSlots callback reference."); + ANS_LOGD("Delete napiAddSlots callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -148,10 +149,11 @@ napi_value NapiAddSlots(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiAddSlots work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiAddSlots callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -190,7 +192,7 @@ napi_value NapiSetSlotByBundle(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("SetSlotByBundle napi_create_async_work start"); + ANS_LOGI("NapiSetSlotByBundle work excute."); auto asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { asynccallbackinfo->info.errorCode = NotificationHelper::UpdateNotificationSlots( @@ -198,12 +200,12 @@ napi_value NapiSetSlotByBundle(napi_env env, napi_callback_info info) } }, [](napi_env env, napi_status status, void *data) { - ANS_LOGI("SetSlotByBundle napi_create_async_work end"); + ANS_LOGI("NapiSetSlotByBundle work complete."); auto asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { - ANS_LOGD("Delete NapiSetSlotByBundle callback reference."); + ANS_LOGD("Delete napiSetSlotByBundle callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -217,10 +219,11 @@ napi_value NapiSetSlotByBundle(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiSetSlotByBundle work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiSetSlotByBundle callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -291,7 +294,7 @@ napi_value NapiGetSlot(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("GetSlot napi_create_async_work start"); + ANS_LOGI("NapiGetSlot work excute."); auto asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { asynccallbackinfo->info.errorCode = @@ -305,10 +308,11 @@ napi_value NapiGetSlot(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiGetSlot work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiGetSlot callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -347,7 +351,7 @@ napi_value NapiGetSlotNumByBundle(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("GetSlotNumByBundle napi_create_async_work start"); + ANS_LOGI("NapiGetSlotNumByBundle work excute."); auto asynccallbackinfo = reinterpret_cast(data); if (asynccallbackinfo) { asynccallbackinfo->info.errorCode = NotificationHelper::GetNotificationSlotNumAsBundle( @@ -355,14 +359,14 @@ napi_value NapiGetSlotNumByBundle(napi_env env, napi_callback_info info) } }, [](napi_env env, napi_status status, void *data) { - ANS_LOGI("GetSlotNumByBundle napi_create_async_work end"); + ANS_LOGI("NapiGetSlotNumByBundle work complete."); auto asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { napi_value result = nullptr; napi_create_uint32(env, asynccallbackinfo->num, &result); Common::CreateReturnValue(env, asynccallbackinfo->info, result); if (asynccallbackinfo->info.callback != nullptr) { - ANS_LOGD("Get slot num by bundle. napi_delete_reference start"); + ANS_LOGD("Delete napiGetSlotNumByBundle callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -376,10 +380,11 @@ napi_value NapiGetSlotNumByBundle(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiGetSlotNumByBundle work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiGetSlotNumByBundle callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -432,7 +437,7 @@ void AsyncCompleteCallbackNapiGetSlots(napi_env env, napi_status status, void *d } Common::CreateReturnValue(env, asynccallbackinfo->info, result); if (asynccallbackinfo->info.callback != nullptr) { - ANS_LOGD("Delete NapiGetSlots callback reference."); + ANS_LOGD("Delete napiGetSlots callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -477,10 +482,11 @@ napi_value NapiGetSlots(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("Queue NapiGetSlots word failed return: %{public}d", status); + ANS_LOGE("Queue napiGetSlots word failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiGetSlots callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -524,7 +530,7 @@ void AsyncCompleteCallbackNapiGetSlotsByBundle(napi_env env, napi_status status, napi_set_element(env, arr, count, nSlot); count++; } - ANS_LOGI("getSlots count = %{public}zu", count); + ANS_LOGI("count = %{public}zu", count); result = arr; if ((count == 0) && (asynccallbackinfo->slots.size() > 0)) { asynccallbackinfo->info.errorCode = ERROR; @@ -566,7 +572,7 @@ napi_value NapiGetSlotsByBundle(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("GetSlotsByBundle napi_create_async_work start"); + ANS_LOGI("NapiGetSlotsByBundle work excute."); auto asynccallbackinfo = reinterpret_cast(data); if (asynccallbackinfo) { asynccallbackinfo->info.errorCode = NotificationHelper::GetNotificationSlotsForBundle( @@ -580,10 +586,11 @@ napi_value NapiGetSlotsByBundle(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiGetSlotsByBundle work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiGetSlotsByBundle callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -622,7 +629,7 @@ napi_value NapiRemoveSlot(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("removeSlot napi_create_async_work start"); + ANS_LOGI("NapiRemoveSlot work excute."); auto asynccallbackinfo = reinterpret_cast(data); if (asynccallbackinfo) { asynccallbackinfo->info.errorCode = @@ -630,7 +637,7 @@ napi_value NapiRemoveSlot(napi_env env, napi_callback_info info) } }, [](napi_env env, napi_status status, void *data) { - ANS_LOGI("removeSlot napi_create_async_work end"); + ANS_LOGI("NapiRemoveSlot work complete."); auto asynccallbackinfo = reinterpret_cast(data); if (asynccallbackinfo) { Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); @@ -649,10 +656,11 @@ napi_value NapiRemoveSlot(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiRemoveSlot work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiRemoveSlot callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -690,14 +698,14 @@ napi_value NapiRemoveAllSlots(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("RemoveAllSlots napi_create_async_work start"); + ANS_LOGI("NapiRemoveAllSlots work excute."); auto asynccallbackinfo = reinterpret_cast(data); if (asynccallbackinfo) { asynccallbackinfo->info.errorCode = NotificationHelper::RemoveAllSlots(); } }, [](napi_env env, napi_status status, void *data) { - ANS_LOGI("RemoveAllSlots napi_create_async_work end"); + ANS_LOGI("NapiRemoveAllSlots work complete."); auto asynccallbackinfo = reinterpret_cast(data); if (asynccallbackinfo) { Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); @@ -716,10 +724,11 @@ napi_value NapiRemoveAllSlots(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiRemoveAllSlots work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiRemoveAllSlots callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -758,7 +767,7 @@ napi_value NapiEnableNotificationSlot(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("EnableNotificationSlot napi_create_async_work start"); + ANS_LOGI("NapiEnableNotificationSlot work excute."); auto asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { asynccallbackinfo->info.errorCode = NotificationHelper::SetEnabledForBundleSlot( @@ -768,7 +777,7 @@ napi_value NapiEnableNotificationSlot(napi_env env, napi_callback_info info) } }, [](napi_env env, napi_status status, void *data) { - ANS_LOGI("EnableNotificationSlot napi_create_async_work end"); + ANS_LOGI("NapiEnableNotificationSlot work complete."); auto asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); @@ -787,10 +796,11 @@ napi_value NapiEnableNotificationSlot(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiEnableNotificationSlot work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiEnableNotificationSlot callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -829,7 +839,7 @@ napi_value NapiIsEnableNotificationSlot(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("IsEnableNotificationSlot napi_create_async_work start"); + ANS_LOGI("NapiIsEnableNotificationSlot work excute."); auto asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { asynccallbackinfo->info.errorCode = NotificationHelper::GetEnabledForBundleSlot( @@ -837,7 +847,7 @@ napi_value NapiIsEnableNotificationSlot(napi_env env, napi_callback_info info) } }, [](napi_env env, napi_status status, void *data) { - ANS_LOGI("IsEnableNotificationSlot napi_create_async_work end"); + ANS_LOGI("NapiIsEnableNotificationSlot work complete."); auto asynccallbackinfo = static_cast(data); if (asynccallbackinfo) { napi_value result = nullptr; @@ -858,10 +868,11 @@ napi_value NapiIsEnableNotificationSlot(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiIsEnableNotificationSlot work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiIsEnableNotificationSlot callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); diff --git a/frameworks/js/napi/src/remove.cpp b/frameworks/js/napi/src/remove.cpp index f0b4ceb25b16570fd187177effd24132ac5a1529..ac71c95906234a817f1329326a0cc5ef79319cc3 100644 --- a/frameworks/js/napi/src/remove.cpp +++ b/frameworks/js/napi/src/remove.cpp @@ -220,7 +220,7 @@ napi_value ParseParameters( // argv[0]: bundle NAPI_CALL(env, napi_typeof(env, argv[PARAM0], &valuetype)); if (valuetype != napi_object) { - ANS_LOGW("Wrong argument type. Object expected."); + ANS_LOGW("Valuetype is not object."); return nullptr; } auto retValue = Common::GetBundleOption(env, argv[PARAM0], params.option); diff --git a/frameworks/js/napi/src/slot.cpp b/frameworks/js/napi/src/slot.cpp index 378cac1c07e4d53ec4be304c019417bd6d66e490..d485c4edc4415ce14c17932c8467058a1a928861 100644 --- a/frameworks/js/napi/src/slot.cpp +++ b/frameworks/js/napi/src/slot.cpp @@ -1190,7 +1190,7 @@ napi_value ParseParametersEnableSlot( // argv[0]: bundle NAPI_CALL(env, napi_typeof(env, argv[PARAM0], &valuetype)); if (valuetype != napi_object) { - ANS_LOGW("ParseParametersEnableSlot, Wrong argument type. Object expected."); + ANS_LOGW("Wrong argument type. Object expected."); return nullptr; } auto retValue = Common::GetBundleOption(env, argv[PARAM0], params.option); diff --git a/frameworks/js/napi/src/subscribe/napi_remove.cpp b/frameworks/js/napi/src/subscribe/napi_remove.cpp index 18feb0049c41fe28ff2ddc3ad910d8e96a7fbe7e..e7298118c2080e99b773fc891307c0b64ecc816e 100644 --- a/frameworks/js/napi/src/subscribe/napi_remove.cpp +++ b/frameworks/js/napi/src/subscribe/napi_remove.cpp @@ -153,6 +153,7 @@ napi_value NapiRemoveAll(napi_env env, napi_callback_info info) asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiRemoveAll callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); diff --git a/frameworks/js/napi/src/subscribe/napi_subscribe.cpp b/frameworks/js/napi/src/subscribe/napi_subscribe.cpp index 41b8054e87289a2bd1b6318079bf3e1f5b761f67..a808cf90e19566bedd4ceb85809acf9ff34d4886 100644 --- a/frameworks/js/napi/src/subscribe/napi_subscribe.cpp +++ b/frameworks/js/napi/src/subscribe/napi_subscribe.cpp @@ -56,7 +56,7 @@ napi_value NapiSubscribe(napi_env env, napi_callback_info info) nullptr, resourceName, [](napi_env env, void *data) { - ANS_LOGI("Subscribe napi_create_async_work start"); + ANS_LOGI("NapiSubscribe work excute."); if (!data) { ANS_LOGE("Invalid asynccallbackinfo!"); return; @@ -77,7 +77,7 @@ napi_value NapiSubscribe(napi_env env, napi_callback_info info) } }, [](napi_env env, napi_status status, void *data) { - ANS_LOGI("Subscribe napi_create_async_work end"); + ANS_LOGI("NapiSubscribe work complete."); if (!data) { ANS_LOGE("Invalid asynccallbackinfo!"); return; @@ -102,10 +102,11 @@ napi_value NapiSubscribe(napi_env env, napi_callback_info info) bool isCallback = asynccallbackinfo->info.isCallback; napi_status status = napi_queue_async_work_with_qos(env, asynccallbackinfo->asyncWork, napi_qos_user_initiated); if (status != napi_ok) { - ANS_LOGE("napi_queue_async_work failed return: %{public}d", status); + ANS_LOGE("Queue napiSubscribe work failed return: %{public}d", status); asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiSubscribe callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork); @@ -190,6 +191,7 @@ napi_value NapiUnsubscribe(napi_env env, napi_callback_info info) asynccallbackinfo->info.errorCode = ERROR_INTERNAL_ERROR; Common::CreateReturnValue(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { + ANS_LOGD("Delete napiUnsubscribe callback reference."); napi_delete_reference(env, asynccallbackinfo->info.callback); } napi_delete_async_work(env, asynccallbackinfo->asyncWork);