Fixed two bugs in LogFactory/LogManager

1. 6354 - Nlog config file locater url encodes the path when using Nlog.dll.nlog config name
2. Invalid config file precedence when multiple config files were found.

Added unit tests.

src/NLog/LogFactory.cs

@@ -146,13 +146,15 @@ public LoggingConfiguration Configuration
                             {
                                 InternalLogger.Debug("Attempting to load config from {0}", configFile);
                                 this.config = new XmlLoggingConfiguration(configFile);
+                                break;
                             }
 #else
                             Uri configFileUri = new Uri(configFile, UriKind.Relative);
                             if (Application.GetResourceStream(configFileUri) != null)
                             {
                                 InternalLogger.Debug("Attempting to load config from {0}", configFile);
                                 this.config = new XmlLoggingConfiguration(configFile);
+                                break;
                             }
 #endif
                         }
@@ -662,14 +664,9 @@ private static IEnumerable<string> GetCandidateFileNames()
             var nlogAssembly = typeof(LogFactory).Assembly;
             if (!nlogAssembly.GlobalAssemblyCache)
             {
-                var codeBase = nlogAssembly.GetName().CodeBase;
-                if (!string.IsNullOrEmpty(codeBase))
+                if (!string.IsNullOrEmpty(nlogAssembly.Location))
                 {
-                    var uri = new Uri(codeBase, UriKind.RelativeOrAbsolute);
-                    if (uri.Scheme == "file")
-                    {
-                        yield return uri.AbsolutePath + ".nlog";
-                    }
+                    yield return nlogAssembly.Location + ".nlog";
                 }
             }
 #endif

tests/NLog.UnitTests/ConfigFileLocatorTests.cs

@@ -0,0 +1,350 @@
+// 
+// Copyright (c) 2004-2011 Jaroslaw Kowalski <jaak@jkowalski.net>
+// 
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions 
+// are met:
+// 
+// * Redistributions of source code must retain the above copyright notice, 
+//   this list of conditions and the following disclaimer. 
+// 
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution. 
+// 
+// * Neither the name of Jaroslaw Kowalski nor the names of its 
+//   contributors may be used to endorse or promote products derived from this
+//   software without specific prior written permission. 
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
+// THE POSSIBILITY OF SUCH DAMAGE.
+// 
+
+#if !SILVERLIGHT && !NET_CF
+
+using System;
+using System.CodeDom.Compiler;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using Microsoft.CSharp;
+using NUnit.Framework;
+
+#if !NUNIT
+    using SetUp = Microsoft.VisualStudio.TestTools.UnitTesting.TestInitializeAttribute;
+    using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute;
+    using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
+    using TearDown =  Microsoft.VisualStudio.TestTools.UnitTesting.TestCleanupAttribute;
+#endif
+
+namespace NLog.UnitTests
+{
+    [TestFixture]
+    public class ConfigFileLocatorTests
+    {
+        private string appConfigContents = @"
+<configuration>
+<configSections>
+    <section name='nlog' type='NLog.Config.ConfigSectionHandler, NLog' requirePermission='false' />
+</configSections>
+
+<nlog>
+  <targets>
+    <target name='c' type='Console' layout='AC ${message}' />
+  </targets>
+  <rules>
+    <logger name='*' minLevel='Info' writeTo='c' />
+  </rules>
+</nlog>
+</configuration>
+";
+
+        private string appNLogContents = @"
+<nlog>
+  <targets>
+    <target name='c' type='Console' layout='AN ${message}' />
+  </targets>
+  <rules>
+    <logger name='*' minLevel='Info' writeTo='c' />
+  </rules>
+</nlog>
+";
+
+        private string nlogConfigContents = @"
+<nlog>
+  <targets>
+    <target name='c' type='Console' layout='NLC ${message}' />
+  </targets>
+  <rules>
+    <logger name='*' minLevel='Info' writeTo='c' />
+  </rules>
+</nlog>
+";
+
+        private string nlogDllNLogContents = @"
+<nlog>
+  <targets>
+    <target name='c' type='Console' layout='NDN ${message}' />
+  </targets>
+  <rules>
+    <logger name='*' minLevel='Info' writeTo='c' />
+  </rules>
+</nlog>
+";
+
+        private string appConfigOutput = "--BEGIN--|AC InfoMsg|AC WarnMsg|AC ErrorMsg|AC FatalMsg|--END--|";
+        private string appNLogOutput = "--BEGIN--|AN InfoMsg|AN WarnMsg|AN ErrorMsg|AN FatalMsg|--END--|";
+        private string nlogConfigOutput = "--BEGIN--|NLC InfoMsg|NLC WarnMsg|NLC ErrorMsg|NLC FatalMsg|--END--|";
+        private string nlogDllNLogOutput = "--BEGIN--|NDN InfoMsg|NDN WarnMsg|NDN ErrorMsg|NDN FatalMsg|--END--|";
+        private string missingConfigOutput = "--BEGIN--|--END--|";
+
+        [Test]
+        public void MissingConfigFileTest()
+        {
+            string dir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+
+            Directory.CreateDirectory(dir);
+            try
+            {
+                string output = RunTestIn(dir);
+                Assert.AreEqual(missingConfigOutput, output);
+            }
+            finally
+            {
+                Directory.Delete(dir, true);
+            }
+        }
+
+        [Test]
+        public void NLogDotConfigTest()
+        {
+            string dir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+
+            Directory.CreateDirectory(dir);
+            try
+            {
+                File.WriteAllText(Path.Combine(dir, "NLog.config"), nlogConfigContents);
+                string output = RunTestIn(dir);
+                Assert.AreEqual(nlogConfigOutput, output);
+            }
+            finally
+            {
+                Directory.Delete(dir, true);
+            }
+        }
+
+        [Test]
+        public void NLogDotDllDotNLogTest()
+        {
+            string dir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+
+            Directory.CreateDirectory(dir);
+            try
+            {
+                File.WriteAllText(Path.Combine(dir, "NLog.dll.nlog"), nlogDllNLogContents);
+                string output = RunTestIn(dir);
+                Assert.AreEqual(nlogDllNLogOutput, output);
+            }
+            finally
+            {
+                Directory.Delete(dir, true);
+            }
+        }
+
+        [Test]
+        public void NLogDotDllDotNLogInDirectoryWithSpaces()
+        {
+            string dir = Path.Combine(Path.GetTempPath(), "abc " + Guid.NewGuid().ToString("N") + " def");
+
+            Directory.CreateDirectory(dir);
+            try
+            {
+                File.WriteAllText(Path.Combine(dir, "NLog.dll.nlog"), nlogDllNLogContents);
+                string output = RunTestIn(dir);
+                Assert.AreEqual(nlogDllNLogOutput, output);
+            }
+            finally
+            {
+                Directory.Delete(dir, true);
+            }
+        }
+
+        [Test]
+        public void AppDotConfigTest()
+        {
+            string dir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+
+            Directory.CreateDirectory(dir);
+            try
+            {
+                File.WriteAllText(Path.Combine(dir, "ConfigFileLocator.exe.config"), appConfigContents);
+                string output = RunTestIn(dir);
+                Assert.AreEqual(appConfigOutput, output);
+            }
+            finally
+            {
+                Directory.Delete(dir, true);
+            }
+        }
+
+        [Test]
+        public void AppDotNLogTest()
+        {
+            string dir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+
+            Directory.CreateDirectory(dir);
+            try
+            {
+                File.WriteAllText(Path.Combine(dir, "ConfigFileLocator.exe.nlog"), appNLogContents);
+                string output = RunTestIn(dir);
+                Assert.AreEqual(appNLogOutput, output);
+            }
+            finally
+            {
+                Directory.Delete(dir, true);
+            }
+        }
+
+        [Test]
+        public void PrecedenceTest()
+        {
+            var precedence = new[]
+                                 {
+                                     new
+                                         {
+                                             File = "ConfigFileLocator.exe.config",
+                                             Contents = appConfigContents,
+                                             Output = appConfigOutput
+                                         },
+                                     new
+                                         {
+                                             File = "NLog.config",
+                                             Contents = nlogConfigContents,
+                                             Output = nlogConfigOutput
+                                         },
+                                     new
+                                         {
+                                             File = "ConfigFileLocator.exe.nlog",
+                                             Contents = appNLogContents,
+                                             Output = appNLogOutput
+                                         },
+                                     new
+                                         {
+                                             File = "NLog.dll.nlog",
+                                             Contents = nlogDllNLogContents,
+                                             Output = nlogDllNLogOutput
+                                         },
+                                 };
+            string dir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+
+            Directory.CreateDirectory(dir);
+            try
+            {
+                // deploy all files
+                foreach (var p in precedence)
+                {
+                    File.WriteAllText(Path.Combine(dir, p.File), p.Contents);
+                }
+
+                string output;
+
+                // walk files in precedence order and delete config files
+                foreach (var p in precedence)
+                {
+                    output = RunTestIn(dir);
+                    Assert.AreEqual(p.Output, output);
+                    File.Delete(Path.Combine(dir, p.File));
+                }
+
+                output = RunTestIn(dir);
+                Assert.AreEqual(missingConfigOutput, output);
+
+            }
+            finally
+            {
+                Directory.Delete(dir, true);
+            }
+
+        }
+
+        private static string RunTestIn(string directory)
+        {
+        string sourceCode = @"
+using System;
+using System.Reflection;
+using NLog;
+
+class C1
+{
+    private static Logger logger = LogManager.GetCurrentClassLogger();
+
+    static void Main(string[] args)
+    {
+        Console.WriteLine(""--BEGIN--"");
+        logger.Trace(""TraceMsg"");
+        logger.Debug(""DebugMsg"");
+        logger.Info(""InfoMsg"");
+        logger.Warn(""WarnMsg"");
+        logger.Error(""ErrorMsg"");
+        logger.Fatal(""FatalMsg"");
+        Console.WriteLine(""--END--"");
+    }
+}";
+            var provider = new CSharpCodeProvider();
+            var options = new CompilerParameters();
+            options.OutputAssembly = Path.Combine(directory, "ConfigFileLocator.exe");
+            options.GenerateExecutable = true;
+            options.ReferencedAssemblies.Add(typeof(Logger).Assembly.Location);
+            options.IncludeDebugInformation = true;
+            if (!File.Exists(options.OutputAssembly))
+            {
+                var results = provider.CompileAssemblyFromSource(options, sourceCode);
+                Assert.IsFalse(results.Errors.HasWarnings);
+                Assert.IsFalse(results.Errors.HasErrors);
+                File.Copy(typeof (Logger).Assembly.Location, Path.Combine(directory, "NLog.dll"));
+            }
+
+            return RunAndRedirectOutput(options.OutputAssembly);
+        }
+
+        public static string RunAndRedirectOutput(string exeFile)
+        {
+            var sb = new StringBuilder();
+#if MONO
+            sb.AppendFormat("\"{0}\" ", exeFile);
+#endif
+
+            using (var proc = new Process())
+            {
+                proc.StartInfo.Arguments = sb.ToString();
+#if MONO
+                proc.StartInfo.FileName = "mono";
+#else
+                proc.StartInfo.FileName = exeFile;
+#endif
+                proc.StartInfo.UseShellExecute = false;
+                proc.StartInfo.WindowStyle = ProcessWindowStyle.Normal;
+                proc.StartInfo.RedirectStandardInput = false;
+                proc.StartInfo.RedirectStandardOutput = true;
+                proc.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
+                proc.StartInfo.CreateNoWindow = true;
+                proc.Start();
+                proc.WaitForExit();
+                return proc.StandardOutput.ReadToEnd().Replace("\r", "").Replace("\n", "|");
+            }
+        }
+    }
+}
+
+#endif

tests/NLog.UnitTests/NLog.UnitTests.monodevelop.csproj

@@ -75,6 +75,7 @@
     <Compile Include="Config\RuleConfigurationTests.cs" />
     <Compile Include="Config\TargetConfigurationTests.cs" />
     <Compile Include="Config\VariableTests.cs" />
+    <Compile Include="ConfigFileLocatorTests.cs" />
     <Compile Include="Contexts\GlobalDiagnosticsContextTests.cs" />
     <Compile Include="Contexts\MappedDiagnosticsContextTests.cs" />
     <Compile Include="Contexts\NestedDiagnosticsContextTests.cs" />