fix: Move log context up to ConfigurationLoader

This allows log context to be available when validation warnings &
errors are printed.
json-serializing-nullable-fields-issue
Robert Dailey 10 months ago
parent 4b3542fc7a
commit de0c6be1d9

@ -2,7 +2,6 @@ using System.IO.Abstractions;
using JetBrains.Annotations; using JetBrains.Annotations;
using Recyclarr.TrashLib.Config.Parsing.ErrorHandling; using Recyclarr.TrashLib.Config.Parsing.ErrorHandling;
using Recyclarr.TrashLib.Config.Yaml; using Recyclarr.TrashLib.Config.Yaml;
using Serilog.Context;
using YamlDotNet.Core; using YamlDotNet.Core;
using YamlDotNet.Serialization; using YamlDotNet.Serialization;
@ -23,7 +22,6 @@ public class ConfigParser
public RootConfigYaml? Load(IFileInfo file) public RootConfigYaml? Load(IFileInfo file)
{ {
_log.Debug("Loading config file: {File}", file); _log.Debug("Loading config file: {File}", file);
using var logScope = LogContext.PushProperty(LogProperty.Scope, file.Name);
return Load(file.OpenText); return Load(file.OpenText);
} }

@ -2,6 +2,7 @@
using AutoMapper; using AutoMapper;
using Recyclarr.TrashLib.Config.Parsing.PostProcessing; using Recyclarr.TrashLib.Config.Parsing.PostProcessing;
using Recyclarr.TrashLib.Config.Services; using Recyclarr.TrashLib.Config.Services;
using Serilog.Context;
namespace Recyclarr.TrashLib.Config.Parsing; namespace Recyclarr.TrashLib.Config.Parsing;
@ -26,6 +27,7 @@ public class ConfigurationLoader : IConfigurationLoader
public IReadOnlyCollection<IServiceConfiguration> Load(IFileInfo file) public IReadOnlyCollection<IServiceConfiguration> Load(IFileInfo file)
{ {
using var logScope = LogContext.PushProperty(LogProperty.Scope, file.Name);
return ProcessLoadedConfigs(_parser.Load(file)); return ProcessLoadedConfigs(_parser.Load(file));
} }

Loading…
Cancel
Save