Merge pull request #184 from NLog/safe-hide-assembly

Better hide assemblies for ${callsite}

Author: 304NotModified

src/NLog.Extensions.Logging/Extensions/ConfigureExtensions.cs

@@ -74,38 +74,36 @@ public static ILoggingBuilder AddNLog(this ILoggingBuilder factory, NLogProvider
         /// </summary>
         private static void ConfigureHiddenAssemblies()
         {
-            try
-            {
-                InternalLogger.Trace("Hide assemblies for callsite");
+
+            InternalLogger.Trace("Hide assemblies for callsite");
 
 #if NETCORE1_0
-                LogManager.AddHiddenAssembly(Assembly.Load(new AssemblyName("Microsoft.Logging")));
+            SafeAddHiddenAssembly("Microsoft.Logging");
 #endif
 
-                LogManager.AddHiddenAssembly(Assembly.Load(new AssemblyName("Microsoft.Extensions.Logging")));
-                LogManager.AddHiddenAssembly(Assembly.Load(new AssemblyName("Microsoft.Extensions.Logging.Abstractions")));
-                LogManager.AddHiddenAssembly(Assembly.Load(new AssemblyName("NLog.Extensions.Logging")));
+            SafeAddHiddenAssembly("Microsoft.Extensions.Logging");
+            SafeAddHiddenAssembly("Microsoft.Extensions.Logging.Abstractions");
+            SafeAddHiddenAssembly("NLog.Extensions.Logging");
 
-                try
-                {
-                    //try the Filter ext
-                    InternalLogger.Trace("Try hide Microsoft.Extensions.Logging.Filter assembly for callsite");
-                    var filterAssembly = Assembly.Load(new AssemblyName("Microsoft.Extensions.Logging.Filter"));
-                    LogManager.AddHiddenAssembly(filterAssembly);
-                    InternalLogger.Trace("Hide Microsoft.Extensions.Logging.Filter assembly for callsite done");
-
-                }
-                catch (Exception ex)
-                {
-                    InternalLogger.Trace(ex, "filtering Microsoft.Extensions.Logging.Filter failed. Not an issue probably");
-                }
+            //try the Filter ext, this one is not mandatory so could fail
+            SafeAddHiddenAssembly("Microsoft.Extensions.Logging.Filter", false);
 
-                InternalLogger.Trace("Hide assemblies for callsite - done");
+        }
 
+        private static void SafeAddHiddenAssembly(string assemblyName, bool logOnException = true)
+        {
+            try
+            {
+                InternalLogger.Trace("Hide {0}", assemblyName);
+                var assembly = Assembly.Load(new AssemblyName(assemblyName));
+                LogManager.AddHiddenAssembly(assembly);
             }
             catch (Exception ex)
             {
-                InternalLogger.Debug(ex, "failure in ignoring assemblies. This could influence the ${callsite}");
+                if (logOnException)
+                {
+                    InternalLogger.Debug(ex, "Hiding assembly {0} failed. This could influence the ${callsite}", assemblyName);
+                }
             }
         }