Browse Source

Logging improved.

pull/329/head
Sebastian Stehle 8 years ago
parent
commit
26b749a226
  1. 2
      src/Squidex.Domain.Apps.Entities/Assets/AssetOptions.cs
  2. 2
      src/Squidex.Domain.Apps.Entities/Contents/ContentOptions.cs
  3. 14
      src/Squidex/Config/Domain/LoggingExtensions.cs
  4. 10
      src/Squidex/Config/Logging.cs

2
src/Squidex.Domain.Apps.Entities/Assets/AssetOptions.cs

@ -9,6 +9,6 @@ namespace Squidex.Domain.Apps.Entities.Assets
{ {
public sealed class AssetOptions public sealed class AssetOptions
{ {
public int MaxResults { get; set; } = 100; public int MaxResults { get; set; } = 200;
} }
} }

2
src/Squidex.Domain.Apps.Entities/Contents/ContentOptions.cs

@ -9,6 +9,6 @@ namespace Squidex.Domain.Apps.Entities.Contents
{ {
public sealed class ContentOptions public sealed class ContentOptions
{ {
public int MaxResults { get; set; } = 100; public int MaxResults { get; set; } = 200;
} }
} }

14
src/Squidex/Config/Domain/LoggingExtensions.cs

@ -6,6 +6,7 @@
// ========================================================================== // ==========================================================================
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
@ -19,15 +20,20 @@ namespace Squidex.Config.Domain
{ {
var log = services.GetRequiredService<ISemanticLog>(); var log = services.GetRequiredService<ISemanticLog>();
var config = services.GetRequiredService<IConfiguration>();
log.LogInformation(w => w log.LogInformation(w => w
.WriteProperty("message", "Application started") .WriteProperty("message", "Application started")
.WriteObject("environment", c => .WriteObject("environment", c =>
{ {
foreach (var kvp in config.AsEnumerable().Where(kvp => kvp.Value != null)) var config = services.GetRequiredService<IConfiguration>();
var logged = new HashSet<string>(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);
}
} }
})); }));
} }

10
src/Squidex/Config/Logging.cs

@ -16,6 +16,16 @@ namespace Squidex.Config
{ {
builder.AddFilter((category, level) => 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)) if (category.StartsWith("Orleans.", StringComparison.OrdinalIgnoreCase))
{ {
return level >= LogLevel.Warning; return level >= LogLevel.Warning;

Loading…
Cancel
Save