update with NLogBuilder

internal logging
NLog · Oct 12, 2017 · 51f8969 · 51f8969
1 parent 6f861ea
commit 51f8969
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 61 deletions.
diff --git a/NLog.Web.AspNetCore/AspNetExtensions.cs b/NLog.Web.AspNetCore/AspNetExtensions.cs
@@ -88,10 +88,8 @@ public static IWebHostBuilder UseNLog(this IWebHostBuilder builder, NLogAspNetCo
                 {
                     ServiceLocator.ServiceProvider = serviceProvider;
 
-                    //register yourself
-                    ConfigurationItemFactory.Default.RegisterItemsFromAssembly(typeof(AspNetExtensions).Assembly);
-
-
+                    NLogBuilder.RegisterNLogWebAspNetCore();
+
                     LogManager.Configuration?.Reload();
                     return new NLogLoggerFactory(options);
 

diff --git a/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj b/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj
@@ -56,6 +56,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="2.0.0" />
+    <PackageReference Include="NLog" Version="4.5.0-beta04" />
 
   </ItemGroup>
   <ItemGroup>

diff --git a/NLog.Web.AspNetCore/NLogBuilder.cs b/NLog.Web.AspNetCore/NLogBuilder.cs
@@ -0,0 +1,60 @@
+#if NETSTANDARD2_0
+
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using NLog.Common;
+using NLog.Config;
+
+namespace NLog.Web
+{
+
+
+    /// <summary>
+    /// NLog helper for ASP.NET Standard 2
+    /// </summary>
+    public static class NLogBuilder
+    {
+        /// <summary>
+        /// Register NLog.Web.AspNetCore, so so &lt;extension&gt; in NLog's config isn't needed.
+        /// </summary>
+        internal static void RegisterNLogWebAspNetCore()
+        {
+            try
+            {
+                InternalLogger.Debug("Registering NLog.Web.AspNetCore");
+                ConfigurationItemFactory.Default.RegisterItemsFromAssembly(typeof(AspNetExtensions).GetTypeInfo().Assembly);
+            }
+            catch (Exception ex)
+            {
+                InternalLogger.Error(ex, "Registering NLog.Web.AspNetCore failed");
+            }
+
+        }
+
+        /// <summary>
+        /// Configure NLog
+        /// </summary>
+        /// <param name="fileName">Path to NLog configuration file, e.g. nlog.config. </param>>
+        /// <returns>LogFactory to get loggers, add events etc</returns>
+        public static LogFactory ConfigureNLog(string fileName)
+        {
+            RegisterNLogWebAspNetCore();
+            return ConfigureNLog(new XmlLoggingConfiguration(fileName));
+        }
+
+        /// <summary>
+        /// Configure NLog
+        /// </summary>
+        /// <param name="configuration"></param>
+        /// <returns>LogFactory to get loggers, add events etc</returns>
+        public static LogFactory ConfigureNLog(LoggingConfiguration configuration)
+        {
+            RegisterNLogWebAspNetCore();
+            LogManager.Configuration = configuration;
+            return LogManager.LogFactory;
+        }
+    }
+}
+#endif
diff --git a/NLog.Web.AspNetCore/NLogStart.cs b/NLog.Web.AspNetCore/NLogStart.cs
diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Program.cs b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Program.cs
@@ -18,7 +18,7 @@ public class Program
         public static void Main(string[] args)
         {
             // NLog: setup the logger first to catch all errors
-            var logger = NLogStart.InitLogger("NLog.config");
+            var logger = NLogBuilder.ConfigureNLog("NLog.config").GetCurrentClassLogger();
             try
             {
                 logger.Debug("init main");