Merge pull request #202 from 304NotModified/fix-callsite-aspnetcore2

Fix ${callsite} in Asp.net core 2
NLog · Oct 13, 2017 · 164c832 · 164c832
2 parents a855ff2 + 4a988ad
commit 164c832
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/NLog.Web.AspNetCore/AspNetExtensions.cs b/NLog.Web.AspNetCore/AspNetExtensions.cs
@@ -72,7 +72,7 @@ private static LoggingConfiguration ConfigureNLog(string fileName)
         /// <returns>LogFactory to get loggers, add events etc</returns>
         public static LogFactory ConfigureNLog(this ILoggingBuilder builder, string configFileName)
         {
-            return NLogBuilder.ConfigureNLog(configFileName);
+            return builder.ConfigureNLog(new XmlLoggingConfiguration(configFileName));
         }
 
         /// <summary>
@@ -85,6 +85,9 @@ public static LogFactory ConfigureNLog(this ILoggingBuilder builder, string conf
         /// <returns>LogFactory to get loggers, add events etc</returns>
         public static LogFactory ConfigureNLog(this ILoggingBuilder builder, LoggingConfiguration configuration)
         {
+            //ConfigureHiddenAssemblies
+            //todo rename there to ConfigureNLog?
+            builder.AddNLog();
             return NLogBuilder.ConfigureNLog(configuration);
         }
 

diff --git a/NLog.Web.AspNetCore/NLogBuilder.cs b/NLog.Web.AspNetCore/NLogBuilder.cs
@@ -30,6 +30,14 @@ internal static void RegisterNLogWebAspNetCore()
             {
                 InternalLogger.Error(ex, "Registering NLog.Web.AspNetCore failed");
             }
+            try
+            {
+                LogManager.AddHiddenAssembly(typeof(NLogBuilder).GetTypeInfo().Assembly);
+            }
+            catch (Exception ex)
+            {
+                InternalLogger.Warn(ex, "Hidding assembly of {0} failed", nameof(NLogBuilder));
+            }
 
         }