diff --git a/frameworks/native/appkit/app/main_thread.cpp b/frameworks/native/appkit/app/main_thread.cpp index 38e5997ea1..bf94a4f119 100644 --- a/frameworks/native/appkit/app/main_thread.cpp +++ b/frameworks/native/appkit/app/main_thread.cpp @@ -3433,7 +3433,7 @@ void MainThread::ParseAppConfigurationParams(const std::string configuration, Co TAG_LOGD(AAFwkTag::APPKIT, "start"); appConfig.AddItem(AAFwk::GlobalConfigurationKey::APP_FONT_SIZE_SCALE, DEFAULT_APP_FONT_SIZE_SCALE); if (configuration.empty()) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "empty configuration"); + TAG_LOGE(AAFwkTag::ABILITYMGR, "empty config"); return; } nlohmann::json configurationJson = nlohmann::json::parse(configuration, nullptr, false); diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp index 92635d3894..bef48e3f8c 100644 --- a/services/abilitymgr/src/ability_connect_manager.cpp +++ b/services/abilitymgr/src/ability_connect_manager.cpp @@ -785,7 +785,7 @@ int AbilityConnectManager::DisconnectRecordNormal(ConnectListType &list, { auto result = connectRecord->DisconnectAbility(); if (result != ERR_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Disconnect ability fail , ret = %{public}d.", result); + TAG_LOGE(AAFwkTag::ABILITYMGR, "fail:%{public}d.", result); return result; } @@ -1959,7 +1959,7 @@ void AbilityConnectManager::AddConnectDeathRecipient(sptr connect std::lock_guard guard(recipientMapMutex_); auto it = recipientMap_.find(connectObject); if (it != recipientMap_.end()) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "This death recipient has been added."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "recipient added before"); return; } } @@ -1973,7 +1973,7 @@ void AbilityConnectManager::AddConnectDeathRecipient(sptr connect } }); if (!connectObject->AddDeathRecipient(deathRecipient)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "AddDeathRecipient failed"); + TAG_LOGE(AAFwkTag::ABILITYMGR, "failed"); return; } std::lock_guard guard(recipientMapMutex_); @@ -2830,7 +2830,7 @@ void AbilityConnectManager::AddUIExtWindowDeathRecipient(const sptr thisWeakPtr(shared_from_this()); diff --git a/services/abilitymgr/src/ability_manager_client.cpp b/services/abilitymgr/src/ability_manager_client.cpp index 27c11dc62c..d588b578d7 100644 --- a/services/abilitymgr/src/ability_manager_client.cpp +++ b/services/abilitymgr/src/ability_manager_client.cpp @@ -493,7 +493,7 @@ ErrCode AbilityManagerClient::ConnectAbility( HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); auto abms = GetAbilityManager(); CHECK_POINTER_RETURN_NOT_CONNECTED(abms); - TAG_LOGI(AAFwkTag::ABILITYMGR, "name:%{public}s %{public}s, userId:%{public}d.", + TAG_LOGI(AAFwkTag::ABILITYMGR, "name:%{public}s %{public}s, userId:%{public}d", want.GetElement().GetBundleName().c_str(), want.GetElement().GetAbilityName().c_str(), userId); return abms->ConnectAbilityCommon(want, connect, callerToken, AppExecFwk::ExtensionAbilityType::SERVICE, userId); } diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index e024a9f00a..716e141894 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -753,7 +753,7 @@ int AbilityManagerService::StartAbilityPublicPrechainCheck(StartAbilityParams &p // 2. validUserId, multi-user if (!JudgeMultiUserConcurrency(params.GetValidUserId())) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied"); return ERR_CROSS_USER; } @@ -1006,7 +1006,7 @@ int AbilityManagerService::StartAbilityInner(const Want &want, const sptr &exte } else if (extensionSessionInfo->want.GetStringParam(UIEXTENSION_TYPE_KEY) == AUTO_FILL_SMART_TPYE) { SplitStr(KEY_SMART_AUTO_FILL_ABILITY, "/", argList); } else { - TAG_LOGW(AAFwkTag::ABILITYMGR, "It is not autofill type."); + TAG_LOGW(AAFwkTag::ABILITYMGR, "not autofill"); return; } @@ -2963,7 +2963,7 @@ int AbilityManagerService::StartUIExtensionAbility(const sptr &exte int32_t validUserId = GetValidUserId(userId); if (!JudgeMultiUserConcurrency(validUserId)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied"); eventInfo.errCode = ERR_INVALID_VALUE; EventReport::SendExtensionEvent(EventName::START_EXTENSION_ERROR, HiSysEventType::FAULT, eventInfo); return ERR_INVALID_VALUE; @@ -3053,7 +3053,7 @@ int AbilityManagerService::StopExtensionAbility(const Want &want, const sptr(want)); bool isEnterpriseAdmin = AAFwk::UIExtensionUtils::IsEnterpriseAdmin(extensionType); if (!isEnterpriseAdmin && !JudgeMultiUserConcurrency(userId)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied"); return ERR_CROSS_USER; } @@ -3942,7 +3942,7 @@ int AbilityManagerService::ConnectLocalAbility(const Want &want, const int32_t u TAG_LOGD(AAFwkTag::ABILITYMGR, "requestWant SetParam success"); if (result != ERR_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Generate ability request error."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Generate request error"); return result; } if (!UriUtils::GetInstance().CheckNonImplicitShareFileUri(abilityRequest)) { @@ -6095,7 +6095,7 @@ int AbilityManagerService::StopServiceAbility(const Want &want, int32_t userId, int32_t validUserId = GetValidUserId(userId); if (!JudgeMultiUserConcurrency(validUserId)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied"); return ERR_CROSS_USER; } @@ -7003,7 +7003,7 @@ int AbilityManagerService::StartAbilityByCall(const Want &want, const sptr &remote) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "recv AbilitySchedulerRecipient death notice"); + TAG_LOGE(AAFwkTag::ABILITYMGR, "call"); if (handler_) { handler_(remote); diff --git a/services/abilitymgr/src/app_exit_reason_data_manager.cpp b/services/abilitymgr/src/app_exit_reason_data_manager.cpp index 25235023a3..cde8248b70 100644 --- a/services/abilitymgr/src/app_exit_reason_data_manager.cpp +++ b/services/abilitymgr/src/app_exit_reason_data_manager.cpp @@ -386,7 +386,7 @@ int32_t AppExitReasonDataManager::DeleteAllRecoverInfoByTokenId(uint32_t tokenId int32_t AppExitReasonDataManager::DeleteAbilityRecoverInfo( uint32_t accessTokenId, const std::string &moduleName, const std::string &abilityName) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "DeleteAbilityRecoverInfo tokenId %{private}u module %{public}s ability %{public}s ", + TAG_LOGI(AAFwkTag::ABILITYMGR, "tokenId %{private}u module %{public}s ability %{public}s ", accessTokenId, moduleName.c_str(), abilityName.c_str()); { std::lock_guard lock(kvStorePtrMutex_); @@ -400,7 +400,7 @@ int32_t AppExitReasonDataManager::DeleteAbilityRecoverInfo( DistributedKv::Value value; DistributedKv::Status status = kvStorePtr_->Get(key, value); if (status != DistributedKv::Status::SUCCESS) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "DeleteAbilityRecoverInfo get error: %{public}d", status); + TAG_LOGE(AAFwkTag::ABILITYMGR, "failed:%{public}d", status); return ERR_INVALID_VALUE; } @@ -429,7 +429,7 @@ int32_t AppExitReasonDataManager::DeleteAbilityRecoverInfo( int32_t AppExitReasonDataManager::GetAbilityRecoverInfo( uint32_t accessTokenId, const std::string &moduleName, const std::string &abilityName, bool &hasRecoverInfo) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "GetAbilityRecoverInfo tokenId %{private}u module %{public}s abillity %{public}s ", + TAG_LOGI(AAFwkTag::ABILITYMGR, "tokenId %{private}u module %{public}s abillity %{public}s", accessTokenId, moduleName.c_str(), abilityName.c_str()); hasRecoverInfo = false; { @@ -445,9 +445,9 @@ int32_t AppExitReasonDataManager::GetAbilityRecoverInfo( DistributedKv::Status status = kvStorePtr_->Get(key, value); if (status != DistributedKv::Status::SUCCESS) { if (status == DistributedKv::Status::KEY_NOT_FOUND) { - TAG_LOGW(AAFwkTag::ABILITYMGR, "GetAbilityRecoverInfo KEY_NOT_FOUND."); + TAG_LOGW(AAFwkTag::ABILITYMGR, "KEY_NOT_FOUND"); } else { - TAG_LOGE(AAFwkTag::ABILITYMGR, "GetAbilityRecoverInfo error: %{public}d.", status); + TAG_LOGE(AAFwkTag::ABILITYMGR, "error:%{public}d", status); } return ERR_INVALID_VALUE; } diff --git a/services/abilitymgr/src/app_exit_reason_helper.cpp b/services/abilitymgr/src/app_exit_reason_helper.cpp index e3aaa48682..64caba0738 100644 --- a/services/abilitymgr/src/app_exit_reason_helper.cpp +++ b/services/abilitymgr/src/app_exit_reason_helper.cpp @@ -68,7 +68,7 @@ int32_t AppExitReasonHelper::RecordAppExitReason(const ExitReason &exitReason) } if (abilityList.empty()) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Active abilityLists empty."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "abilityLists empty"); return ERR_GET_ACTIVE_ABILITY_LIST_EMPTY; } int32_t userId; @@ -138,7 +138,7 @@ int32_t AppExitReasonHelper::RecordProcessExitReason(const int32_t pid, const st auto ret = DelayedSingleton::GetInstance()->NotifyAppMgrRecordExitReason(pid, exitReason.reason, exitReason.exitMsg); if (ret != ERR_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "NotifyAppMgrRecordExitReason failed.code: %{public}d", ret); + TAG_LOGE(AAFwkTag::ABILITYMGR, "NotifyAppMgrRecordExitReason failed:%{public}d", ret); } if (abilityLists.empty()) { diff --git a/services/abilitymgr/src/app_scheduler.cpp b/services/abilitymgr/src/app_scheduler.cpp index 609b181cf8..cb7e9e044c 100644 --- a/services/abilitymgr/src/app_scheduler.cpp +++ b/services/abilitymgr/src/app_scheduler.cpp @@ -479,13 +479,13 @@ int AppScheduler::GetApplicationInfoByProcessID(const int pid, AppExecFwk::Appli int32_t AppScheduler::NotifyAppMgrRecordExitReason(int32_t pid, int32_t reason, const std::string &exitMsg) { if (pid < 0) { - TAG_LOGW(AAFwkTag::ABILITYMGR, "NotifyAppMgrRecordExitReason failed, pid <= 0."); + TAG_LOGW(AAFwkTag::ABILITYMGR, "pid<=0"); return ERR_INVALID_VALUE; } CHECK_POINTER_AND_RETURN(appMgrClient_, INNER_ERR); auto ret = static_cast(IN_PROCESS_CALL(appMgrClient_->NotifyAppMgrRecordExitReason(pid, reason, exitMsg))); if (ret != ERR_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "NotifyAppMgrRecordExitReason failed."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "failed"); return ret; } return ERR_OK; diff --git a/services/abilitymgr/src/call_container.cpp b/services/abilitymgr/src/call_container.cpp index e0c9f835f3..ca1f10b5ef 100644 --- a/services/abilitymgr/src/call_container.cpp +++ b/services/abilitymgr/src/call_container.cpp @@ -135,7 +135,7 @@ bool CallContainer::CallRequestDone(const sptr &callStub) } }); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Call Request Done end."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "end"); return true; } diff --git a/services/abilitymgr/src/interceptor/extension_control_interceptor.cpp b/services/abilitymgr/src/interceptor/extension_control_interceptor.cpp index 1f002e1652..d871867a7e 100644 --- a/services/abilitymgr/src/interceptor/extension_control_interceptor.cpp +++ b/services/abilitymgr/src/interceptor/extension_control_interceptor.cpp @@ -60,7 +60,7 @@ ErrCode ExtensionControlInterceptor::DoProcess(AbilityInterceptorParam param) return EXTENSION_BLOCKED_BY_SERVICE_LIST; } - TAG_LOGI(AAFwkTag::ABILITYMGR, "other ok."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "other ok"); return ERR_OK; } diff --git a/services/abilitymgr/src/preload_uiext_state_observer.cpp b/services/abilitymgr/src/preload_uiext_state_observer.cpp index 81dc573cf6..4205393c7d 100644 --- a/services/abilitymgr/src/preload_uiext_state_observer.cpp +++ b/services/abilitymgr/src/preload_uiext_state_observer.cpp @@ -26,7 +26,7 @@ PreLoadUIExtStateObserver::PreLoadUIExtStateObserver( void PreLoadUIExtStateObserver::OnProcessDied(const AppExecFwk::ProcessData &processData) { auto diedProcessName = processData.processName; - TAG_LOGI(AAFwkTag::ABILITYMGR, "DiedProcessName is %{public}s.", diedProcessName.c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "process:%{public}s", diedProcessName.c_str()); auto extensionRecord = extensionRecord_.lock(); if (extensionRecord != nullptr) { auto hostPid = extensionRecord->hostPid_; diff --git a/services/abilitymgr/src/resident_process_manager.cpp b/services/abilitymgr/src/resident_process_manager.cpp index 932ae3fe60..4ba3949b9d 100644 --- a/services/abilitymgr/src/resident_process_manager.cpp +++ b/services/abilitymgr/src/resident_process_manager.cpp @@ -249,7 +249,7 @@ void ResidentProcessManager::OnAppStateChanged(const AppInfo &info) bool localEnable = false; auto rdbResult = AmsResidentProcessRdb::GetInstance().GetResidentProcessEnable(bundleName, localEnable); if (rdbResult != Rdb_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to obtain resident process properties. result: %{public}d", rdbResult); + TAG_LOGE(AAFwkTag::ABILITYMGR, "GetResidentProcessEnable failed: %{public}d", rdbResult); return; } diff --git a/services/abilitymgr/src/sender_info.cpp b/services/abilitymgr/src/sender_info.cpp index 6e5c87c45a..7f75db03a5 100644 --- a/services/abilitymgr/src/sender_info.cpp +++ b/services/abilitymgr/src/sender_info.cpp @@ -21,7 +21,7 @@ namespace OHOS { namespace AAFwk { bool SenderInfo::ReadFromParcel(Parcel &parcel) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); code = parcel.ReadInt32(); std::unique_ptr wantResquest(parcel.ReadParcelable()); @@ -53,7 +53,7 @@ bool SenderInfo::ReadFromParcel(Parcel &parcel) SenderInfo *SenderInfo::Unmarshalling(Parcel &parcel) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); SenderInfo *info = new (std::nothrow) SenderInfo(); if (info == nullptr) { @@ -71,7 +71,7 @@ SenderInfo *SenderInfo::Unmarshalling(Parcel &parcel) bool SenderInfo::Marshalling(Parcel &parcel) const { - TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); if (!parcel.WriteInt32(code)) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to write code"); diff --git a/services/abilitymgr/src/sub_managers_helper.cpp b/services/abilitymgr/src/sub_managers_helper.cpp index 0400e6d3b9..57d131461b 100644 --- a/services/abilitymgr/src/sub_managers_helper.cpp +++ b/services/abilitymgr/src/sub_managers_helper.cpp @@ -445,7 +445,7 @@ bool SubManagersHelper::VerificationAllToken(const sptr &token) return true; } } - TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to verify all token."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "fail"); return false; } diff --git a/services/appmgr/src/app_mgr_service.cpp b/services/appmgr/src/app_mgr_service.cpp index 4c0eeb179d..7962c30c05 100644 --- a/services/appmgr/src/app_mgr_service.cpp +++ b/services/appmgr/src/app_mgr_service.cpp @@ -1084,7 +1084,7 @@ int32_t AppMgrService::NotifyHotReloadPage(const std::string &bundleName, const int32_t AppMgrService::SetContinuousTaskProcess(int32_t pid, bool isContinuousTask) { if (!AAFwk::PermissionVerification::GetInstance()->CheckSpecificSystemAbilityAccessPermission(FOUNDATION_PROCESS)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "caller is not foundation."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "caller not foundation"); return ERR_INVALID_OPERATION; } if (!IsReady()) {