From a5e7c7a1c8c5e23f5e8b4351ca165876a6e21db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 6 May 2020 01:37:55 +0300 Subject: [PATCH] Clean unnecessary logging. --- .../AbpApplicationConfigurationAppService.cs | 28 +++++-------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs index 187823b663..98fd94882d 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs @@ -63,7 +63,9 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations { //TODO: Optimize & cache..? - return new ApplicationConfigurationDto + Logger.LogDebug("Executing AbpApplicationConfigurationAppService.GetAsync()..."); + + var result = new ApplicationConfigurationDto { Auth = await GetAuthConfigAsync(), Features = await GetFeaturesConfigAsync(), @@ -74,6 +76,10 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations CurrentTenant = GetCurrentTenant(), ObjectExtensions = _cachedObjectExtensionsDtoService.Get() }; + + Logger.LogDebug("Executed AbpApplicationConfigurationAppService.GetAsync()."); + + return result; } protected virtual CurrentTenantDto GetCurrentTenant() @@ -107,35 +113,25 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations protected virtual async Task GetAuthConfigAsync() { - Logger.LogDebug("Executing AbpApplicationConfigurationAppService.GetAuthConfigAsync()"); - var authConfig = new ApplicationAuthConfigurationDto(); var policyNames = await _abpAuthorizationPolicyProvider.GetPoliciesNamesAsync(); - Logger.LogDebug($"GetPoliciesNamesAsync returns {policyNames.Count} items."); - foreach (var policyName in policyNames) { authConfig.Policies[policyName] = true; - Logger.LogDebug($"_authorizationService.IsGrantedAsync? {policyName}"); - if (await _authorizationService.IsGrantedAsync(policyName)) { authConfig.GrantedPolicies[policyName] = true; } } - Logger.LogDebug("Executed AbpApplicationConfigurationAppService.GetAuthConfigAsync()"); - return authConfig; } protected virtual async Task GetLocalizationConfigAsync() { - Logger.LogDebug("Executing AbpApplicationConfigurationAppService.GetLocalizationConfigAsync()"); - var localizationConfig = new ApplicationLocalizationConfigurationDto(); localizationConfig.Languages.AddRange(await _languageProvider.GetLanguagesAsync()); @@ -165,8 +161,6 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations ); } - Logger.LogDebug("Executed AbpApplicationConfigurationAppService.GetLocalizationConfigAsync()"); - return localizationConfig; } @@ -197,8 +191,6 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations private async Task GetSettingConfigAsync() { - Logger.LogDebug("Executing AbpApplicationConfigurationAppService.GetSettingConfigAsync()"); - var result = new ApplicationSettingConfigurationDto { Values = new Dictionary() @@ -214,15 +206,11 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations result.Values[settingDefinition.Name] = await _settingProvider.GetOrNullAsync(settingDefinition.Name); } - Logger.LogDebug("Executed AbpApplicationConfigurationAppService.GetSettingConfigAsync()"); - return result; } protected virtual async Task GetFeaturesConfigAsync() { - Logger.LogDebug("Executing AbpApplicationConfigurationAppService.GetFeaturesConfigAsync()"); - var result = new ApplicationFeatureConfigurationDto(); foreach (var featureDefinition in _featureDefinitionManager.GetAll()) @@ -235,8 +223,6 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations result.Values[featureDefinition.Name] = await FeatureChecker.GetOrNullAsync(featureDefinition.Name); } - Logger.LogDebug("Executed AbpApplicationConfigurationAppService.GetFeaturesConfigAsync()"); - return result; } }