From 193c5dadef3fe96fc92b23fddc2a3da7d5b9fe47 Mon Sep 17 00:00:00 2001 From: cheerful_ricky Date: Wed, 27 Aug 2025 11:54:24 +0800 Subject: [PATCH] refactor ces log Signed-off-by: cheerful_ricky --- services/src/common_event_control_manager.cpp | 28 ++++++++++++------- services/src/inner_common_event_manager.cpp | 4 +-- services/src/static_subscriber_manager.cpp | 10 +++---- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/services/src/common_event_control_manager.cpp b/services/src/common_event_control_manager.cpp index 5dfcc352..dac16786 100644 --- a/services/src/common_event_control_manager.cpp +++ b/services/src/common_event_control_manager.cpp @@ -167,9 +167,8 @@ bool CommonEventControlManager::NotifyFreezeEvents( EVENT_LOGE("commonEventData == nullptr"); return false; } - EVENT_LOGI("Send %{public}s to subscriber %{public}s when unfreezed", - eventRecord.commonEventData->GetWant().GetAction().c_str(), - subscriberRecord.eventRecordInfo.subId.c_str()); + EVENT_LOGI("Send %{public}s when %{public}d unfreezed", + eventRecord.commonEventData->GetWant().GetAction().c_str(), subscriberRecord.eventRecordInfo.pid); commonEventListenerProxy->NotifyEvent(*(eventRecord.commonEventData), false, eventRecord.publishInfo->IsSticky()); AccessTokenHelper::RecordSensitivePermissionUsage(subscriberRecord.eventRecordInfo.callerToken, @@ -196,6 +195,7 @@ void CommonEventControlManager::NotifyUnorderedEventLocked(std::shared_ptrreceivers) { if (vec == nullptr) { EVENT_LOGE("invalid vec"); @@ -208,7 +208,9 @@ void CommonEventControlManager::NotifyUnorderedEventLocked(std::shared_ptr::GetInstance()->InsertFrozenEvents(vec, *eventRecord); DelayedSingleton::GetInstance()->InsertFrozenEventsMap( vec, *eventRecord); - EVENT_LOGE("Notify %{public}s to freeze subscriber, subId = %{public}s", + freezedPids.append(std::to_string(vec->eventRecordInfo.pid)); + freezedPids.append(","); + EVENT_LOGD("Notify %{public}s to freeze subscriber, subId = %{public}s", eventRecord->commonEventData->GetWant().GetAction().c_str(), vec->eventRecordInfo.subId.c_str()); freezeCnt++; continue; @@ -237,9 +239,10 @@ void CommonEventControlManager::NotifyUnorderedEventLocked(std::shared_ptreventRecordInfo.callerToken, eventRecord->commonEventData->GetWant().GetAction()); } - EVENT_LOGI("Notify %{public}s end(%{public}zu, %{public}d, %{public}d, %{public}d)", - eventRecord->commonEventData->GetWant().GetAction().c_str(), - eventRecord->receivers.size(), succCnt, failCnt, freezeCnt); + EVENT_LOGI("Pid %{public}d publish %{public}s to %{public}d end(%{public}zu, %{public}d, %{public}d," + "%{public}d), freezePid[%{public}s]", + eventRecord->eventRecordInfo.pid, eventRecord->commonEventData->GetWant().GetAction().c_str(), + eventRecord->userId, eventRecord->receivers.size(), succCnt, failCnt, freezeCnt, freezedPids.c_str()); } bool CommonEventControlManager::NotifyUnorderedEvent(std::shared_ptr &eventRecord) @@ -532,11 +535,16 @@ void CommonEventControlManager::ProcessNextOrderedEvent(bool isSendMsg) EVENT_LOGE("Failed to get IEventReceive proxy"); return; } - receiver->NotifyEvent(*(sp->commonEventData), true, sp->publishInfo->IsSticky()); + int32_t result = receiver->NotifyEvent(*(sp->commonEventData), true, sp->publishInfo->IsSticky()); + if (result != ERR_OK) { + EVENT_LOGE("Notify %{public}s fail to final receiver", + sp->commonEventData->GetWant().GetAction().c_str()); + } sp->resultTo = nullptr; } - EVENT_LOGI("Notify %{public}s end(%{public}zu, %{public}zu)", - sp->commonEventData->GetWant().GetAction().c_str(), numReceivers, sp->nextReceiver); + EVENT_LOGI("Pid %{public}d publish %{public}s to %{public}d end(%{public}zu, %{public}zu)", + sp->eventRecordInfo.pid, sp->commonEventData->GetWant().GetAction().c_str(), sp->userId, + numReceivers, sp->nextReceiver); CancelTimeout(); orderedEventQueue_.erase(orderedEventQueue_.begin()); diff --git a/services/src/inner_common_event_manager.cpp b/services/src/inner_common_event_manager.cpp index c7c04e33..c608990c 100644 --- a/services/src/inner_common_event_manager.cpp +++ b/services/src/inner_common_event_manager.cpp @@ -251,7 +251,7 @@ bool InnerCommonEventManager::PublishCommonEvent(const CommonEventData &data, co } } - EVENT_LOGI("pid=%{public}d publish %{public}s to %{public}d", pid, data.GetWant().GetAction().c_str(), user); + EVENT_LOGD("pid=%{public}d publish %{public}s to %{public}d", pid, data.GetWant().GetAction().c_str(), user); if (staticSubscriberManager_ != nullptr) { staticSubscriberManager_->PublishCommonEvent(data, publishInfo, callerToken, user, service, bundleName); @@ -580,7 +580,7 @@ bool InnerCommonEventManager::PublishStickyEvent( EVENT_LOGW("commonEventRecord is nullptr and get next"); continue; } - EVENT_LOGI("Publish sticky event : %{public}s", + EVENT_LOGI("publish %{public}s", commonEventRecord->commonEventData->GetWant().GetAction().c_str()); if (!commonEventRecord->publishInfo->GetBundleName().empty() && diff --git a/services/src/static_subscriber_manager.cpp b/services/src/static_subscriber_manager.cpp index 1259c4c4..d2a38361 100644 --- a/services/src/static_subscriber_manager.cpp +++ b/services/src/static_subscriber_manager.cpp @@ -186,14 +186,14 @@ void StaticSubscriberManager::PublishCommonEventInner(const CommonEventData &dat continue; } if (subscriber.userId < SUBSCRIBE_USER_SYSTEM_BEGIN) { - EVENT_LOGW("subscriber %{public}s userId is invalid, subscriber.userId = %{public}d", + EVENT_LOGD("subscriber %{public}s userId is invalid, subscriber.userId = %{public}d", subscriber.bundleName.c_str(), subscriber.userId); SendStaticEventProcErrHiSysEvent(userId, bundleName, subscriber.bundleName, data.GetWant().GetAction()); continue; } if ((subscriber.userId > SUBSCRIBE_USER_SYSTEM_END) && (userId != ALL_USER) && (subscriber.userId != userId)) { - EVENT_LOGW("subscriber %{public}s userId is not match, subscriber.userId = %{public}d," + EVENT_LOGD("subscriber %{public}s userId is not match, subscriber.userId = %{public}d," "userId = %{public}d", subscriber.bundleName.c_str(), subscriber.userId, userId); SendStaticEventProcErrHiSysEvent(userId, bundleName, subscriber.bundleName, data.GetWant().GetAction()); continue; @@ -203,12 +203,12 @@ void StaticSubscriberManager::PublishCommonEventInner(const CommonEventData &dat continue; } if (!VerifyPublisherPermission(callerToken, subscriber.permission)) { - EVENT_LOGW("publisher does not have required permission %{public}s", subscriber.permission.c_str()); + EVENT_LOGD("publisher does not have required permission %{public}s", subscriber.permission.c_str()); SendStaticEventProcErrHiSysEvent(userId, bundleName, subscriber.bundleName, data.GetWant().GetAction()); continue; } if (!IsFilterParameters(subscriber, data)) { - EVENT_LOGW("subscriber filter parameters is not match, subscriber.bundleName = %{public}s", + EVENT_LOGD("subscriber filter parameters is not match, subscriber.bundleName = %{public}s", subscriber.bundleName.c_str()); continue; } @@ -297,7 +297,7 @@ bool StaticSubscriberManager::CheckSubscriberWhetherMatched( result = ((checkResult & filterSettings) != 0); } if (!result) { - EVENT_LOGW("%{public}s not matched,%{public}d_%{public}u_%{public}u", subscriber.bundleName.c_str(), + EVENT_LOGD("%{public}s not matched,%{public}d_%{public}u_%{public}u", subscriber.bundleName.c_str(), static_cast(publishInfo.GetValidationRule()), static_cast(checkResult), static_cast(filterSettings)); } -- Gitee