From 26b749a226d586840b6e192a4e3c59d3c68bdaf2 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sun, 14 Oct 2018 20:54:15 +0200 Subject: [PATCH] Logging improved. --- .../Assets/AssetOptions.cs | 2 +- .../Contents/ContentOptions.cs | 2 +- src/Squidex/Config/Domain/LoggingExtensions.cs | 14 ++++++++++---- src/Squidex/Config/Logging.cs | 10 ++++++++++ 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/Squidex.Domain.Apps.Entities/Assets/AssetOptions.cs b/src/Squidex.Domain.Apps.Entities/Assets/AssetOptions.cs index 6ed716f5d..1326eaa4f 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/AssetOptions.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/AssetOptions.cs @@ -9,6 +9,6 @@ namespace Squidex.Domain.Apps.Entities.Assets { public sealed class AssetOptions { - public int MaxResults { get; set; } = 100; + public int MaxResults { get; set; } = 200; } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentOptions.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentOptions.cs index 0174a2808..4b58d7312 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentOptions.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentOptions.cs @@ -9,6 +9,6 @@ namespace Squidex.Domain.Apps.Entities.Contents { public sealed class ContentOptions { - public int MaxResults { get; set; } = 100; + public int MaxResults { get; set; } = 200; } } diff --git a/src/Squidex/Config/Domain/LoggingExtensions.cs b/src/Squidex/Config/Domain/LoggingExtensions.cs index 65dbfe410..0ee6c0844 100644 --- a/src/Squidex/Config/Domain/LoggingExtensions.cs +++ b/src/Squidex/Config/Domain/LoggingExtensions.cs @@ -6,6 +6,7 @@ // ========================================================================== using System; +using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -19,15 +20,20 @@ namespace Squidex.Config.Domain { var log = services.GetRequiredService(); - var config = services.GetRequiredService(); - log.LogInformation(w => w .WriteProperty("message", "Application started") .WriteObject("environment", c => { - foreach (var kvp in config.AsEnumerable().Where(kvp => kvp.Value != null)) + var config = services.GetRequiredService(); + + var logged = new HashSet(StringComparer.OrdinalIgnoreCase); + + foreach (var kvp in config.AsEnumerable().Where(kvp => kvp.Value != null).Select(x => new { Key = x.Key.ToLowerInvariant(), x.Value }).OrderBy(x => x.Key)) { - c.WriteProperty(kvp.Key, kvp.Value); + if (logged.Add(kvp.Key)) + { + c.WriteProperty(kvp.Key, kvp.Value); + } } })); } diff --git a/src/Squidex/Config/Logging.cs b/src/Squidex/Config/Logging.cs index ecd1c0859..bea1bbd60 100644 --- a/src/Squidex/Config/Logging.cs +++ b/src/Squidex/Config/Logging.cs @@ -16,6 +16,16 @@ namespace Squidex.Config { builder.AddFilter((category, level) => { + if (category.StartsWith("Orleans.Runtime.NoOpHostEnvironmentStatistics", StringComparison.OrdinalIgnoreCase)) + { + return level >= LogLevel.Error; + } + + if (category.StartsWith("Orleans.Runtime.Scheduler", StringComparison.OrdinalIgnoreCase)) + { + return level >= LogLevel.Error; + } + if (category.StartsWith("Orleans.", StringComparison.OrdinalIgnoreCase)) { return level >= LogLevel.Warning;