Merge pull request serilog#719 from nblumhardt/dev

Make the return value of `LoggerConfiguration.CreateLogger()` concrete
ite-klass · Apr 20, 2016 · 3212714 · 3212714
2 parents 2f6cf15 + 0bc3b21
commit 3212714
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/src/Serilog/Core/Pipeline/Logger.cs → src/Serilog/Core/Logger.cs b/src/Serilog/Core/Pipeline/Logger.cs → src/Serilog/Core/Logger.cs
@@ -20,9 +20,9 @@
 using Serilog.Events;
 using Serilog.Parameters;
 
-namespace Serilog.Core.Pipeline
+namespace Serilog.Core
 {
-    sealed class Logger : ILogger, ILogEventSink, IDisposable
+    public sealed class Logger : ILogger, ILogEventSink, IDisposable
     {
         readonly MessageTemplateProcessor _messageTemplateProcessor;
         readonly ILogEventSink _sink;
@@ -37,7 +37,7 @@ sealed class Logger : ILogger, ILogEventSink, IDisposable
         readonly LogEventLevel _minimumLevel;
         readonly LoggingLevelSwitch _levelSwitch;
 
-        public Logger(
+        internal Logger(
             MessageTemplateProcessor messageTemplateProcessor,
             LogEventLevel minimumLevel,
             ILogEventSink sink,
@@ -47,7 +47,7 @@ public Logger(
         {
         }
 
-        public Logger(
+        internal Logger(
             MessageTemplateProcessor messageTemplateProcessor,
             LoggingLevelSwitch levelSwitch,
             ILogEventSink sink,

diff --git a/src/Serilog/LoggerConfiguration.cs b/src/Serilog/LoggerConfiguration.cs
@@ -17,7 +17,6 @@
 using System.Linq;
 using Serilog.Configuration;
 using Serilog.Core;
-using Serilog.Core.Pipeline;
 using Serilog.Core.Sinks;
 using Serilog.Events;
 using Serilog.Parameters;
@@ -132,16 +131,12 @@ public LoggerSettingsConfiguration ReadFrom
         /// <remarks>To free resources held by sinks ahead of program shutdown,
         /// the returned logger may be cast to <see cref="IDisposable"/> and
         /// disposed.</remarks>
-        public ILogger CreateLogger()
+        public Logger CreateLogger()
         {
             if (_loggerCreated)
-                throw new InvalidOperationException($"CreateLogger was previously called and can only be called once.");
+                throw new InvalidOperationException("CreateLogger was previously called and can only be called once.");
             _loggerCreated = true;
 
-            if (!_logEventSinks.Any())
-                return new SilentLogger();
-
-
             Action dispose = () =>
             {
                 foreach (var disposable in _logEventSinks.OfType<IDisposable>())

diff --git a/test/Serilog.Tests/LoggerConfigurationTests.cs b/test/Serilog.Tests/LoggerConfigurationTests.cs
@@ -245,13 +245,6 @@ public void LevelSwitchTakesPrecedenceOverMinimumLevel()
             Assert.Equal(1, sink.Events.Count);
         }
 
-        [Fact]
-        public void AnUnconfiguredLoggerShouldBeTheNullLogger()
-        {
-            var actual = new LoggerConfiguration().CreateLogger();
-            Assert.Equal(actual.GetType().Name, "SilentLogger");
-        }
-
         [Fact]
         public void LastMinimumLevelConfigurationWins()
         {