From de0c6be1d9396d872d9c82ba6c9ac8acbe013815 Mon Sep 17 00:00:00 2001
From: Robert Dailey <git@rdailey.me>
Date: Sat, 19 Aug 2023 22:02:57 -0500
Subject: [PATCH] fix: Move log context up to ConfigurationLoader

This allows log context to be available when validation warnings &
errors are printed.
---
 src/Recyclarr.TrashLib/Config/Parsing/ConfigParser.cs        | 2 --
 src/Recyclarr.TrashLib/Config/Parsing/ConfigurationLoader.cs | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Recyclarr.TrashLib/Config/Parsing/ConfigParser.cs b/src/Recyclarr.TrashLib/Config/Parsing/ConfigParser.cs
index 712502bc..57c01626 100644
--- a/src/Recyclarr.TrashLib/Config/Parsing/ConfigParser.cs
+++ b/src/Recyclarr.TrashLib/Config/Parsing/ConfigParser.cs
@@ -2,7 +2,6 @@ using System.IO.Abstractions;
 using JetBrains.Annotations;
 using Recyclarr.TrashLib.Config.Parsing.ErrorHandling;
 using Recyclarr.TrashLib.Config.Yaml;
-using Serilog.Context;
 using YamlDotNet.Core;
 using YamlDotNet.Serialization;
 
@@ -23,7 +22,6 @@ public class ConfigParser
     public RootConfigYaml? Load(IFileInfo file)
     {
         _log.Debug("Loading config file: {File}", file);
-        using var logScope = LogContext.PushProperty(LogProperty.Scope, file.Name);
         return Load(file.OpenText);
     }
 
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/ConfigurationLoader.cs b/src/Recyclarr.TrashLib/Config/Parsing/ConfigurationLoader.cs
index 1e81f3a8..84947ba8 100644
--- a/src/Recyclarr.TrashLib/Config/Parsing/ConfigurationLoader.cs
+++ b/src/Recyclarr.TrashLib/Config/Parsing/ConfigurationLoader.cs
@@ -2,6 +2,7 @@
 using AutoMapper;
 using Recyclarr.TrashLib.Config.Parsing.PostProcessing;
 using Recyclarr.TrashLib.Config.Services;
+using Serilog.Context;
 
 namespace Recyclarr.TrashLib.Config.Parsing;
 
@@ -26,6 +27,7 @@ public class ConfigurationLoader : IConfigurationLoader
 
     public IReadOnlyCollection<IServiceConfiguration> Load(IFileInfo file)
     {
+        using var logScope = LogContext.PushProperty(LogProperty.Scope, file.Name);
         return ProcessLoadedConfigs(_parser.Load(file));
     }