Merge branch 'daveaglick-issue561' into dev

ite-klass · Nov 20, 2015 · 1218d62 · 1218d62
2 parents 22e9da9 + 2e3470b
commit 1218d62
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/Serilog/LoggerConfiguration.cs b/src/Serilog/LoggerConfiguration.cs
@@ -38,6 +38,7 @@ public class LoggerConfiguration
         LogEventLevel _minimumLevel = LogEventLevel.Information;
         LoggingLevelSwitch _levelSwitch;
         int _maximumDestructuringDepth = 10;
+        bool _loggerCreated;
 
         /// <summary>
         /// Configures the sinks that log events will be emitted to.
@@ -124,6 +125,10 @@ public LoggerSettingsConfiguration ReadFrom
         /// disposed.</remarks>
         public ILogger CreateLogger()
         {
+            if (_loggerCreated)
+                throw new InvalidOperationException($"CreateLogger was previously called and can only be called once.");
+            _loggerCreated = true;
+
             if (!_logEventSinks.Any())
                 return new SilentLogger();
 

diff --git a/test/Serilog.Tests/LoggerConfigurationTests.cs b/test/Serilog.Tests/LoggerConfigurationTests.cs
@@ -26,6 +26,14 @@ public void Dispose()
             }
         }
 
+        [Fact]
+        public void CreateLoggerThrowsIfCalledMoreThanOnce()
+        {
+            var loggerConfiguration = new LoggerConfiguration();
+            loggerConfiguration.CreateLogger();
+            Assert.Throws<InvalidOperationException>(() => loggerConfiguration.CreateLogger());
+        }
+
         [Fact]
         public void DisposableSinksAreDisposedAlongWithRootLogger()
         {