Review feedback items

ite-klass · May 28, 2017 · 60b71b4 · 60b71b4
1 parent 6190ca8
commit 60b71b4
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 4 deletions.
diff --git a/src/Serilog/Context/LogContext.cs b/src/Serilog/Context/LogContext.cs
@@ -80,12 +80,12 @@ public static IDisposable PushProperty(string name, object value, bool destructu
         }
 
         /// <summary>
-        /// Push an enricher onto context, returning an <see cref="IDisposable"/>
+        /// Push an enricher onto the context, returning an <see cref="IDisposable"/>
         /// that must later be used to remove the property, along with any others that
         /// may have been pushed on top of it and not yet popped. The property must
         /// be popped from the same thread/logical call context.
         /// </summary>
-        /// <param name="enricher">Log Properties to push onto the log context</param>
+        /// <param name="enricher">An enricher to push onto the log context</param>
         /// <returns>A token that must be disposed, in order, to pop properties back off the stack.</returns>
         /// <exception cref="ArgumentNullException"></exception>
         public static IDisposable Push(ILogEventEnricher enricher)
@@ -107,7 +107,7 @@ public static IDisposable Push(ILogEventEnricher enricher)
         /// be popped from the same thread/logical call context.
         /// </summary>
         /// <seealso cref="PropertyEnricher"/>.
-        /// <param name="enrichers">Log Properties to push onto the log context</param>
+        /// <param name="enrichers">Enrichers to push onto the log context</param>
         /// <returns>A token that must be disposed, in order, to pop properties back off the stack.</returns>
         /// <exception cref="ArgumentNullException"></exception>
         public static IDisposable Push(params ILogEventEnricher[] enrichers)
@@ -129,7 +129,7 @@ public static IDisposable Push(params ILogEventEnricher[] enrichers)
         /// Push enrichers onto the log context. This method is obsolete, please
         /// use <see cref="Push(Serilog.Core.ILogEventEnricher[])"/> instead.
         /// </summary>
-        /// <param name="properties">Log Properties to push onto the log context</param>
+        /// <param name="properties">Enrichers to push onto the log context</param>
         /// <returns>A token that must be disposed, in order, to pop properties back off the stack.</returns>
         /// <exception cref="ArgumentNullException"></exception>
         [Obsolete("Please use `LogContext.Push(properties)` instead.")]

diff --git a/test/Serilog.Tests/Context/LogContextTests.cs b/test/Serilog.Tests/Context/LogContextTests.cs
@@ -70,6 +70,36 @@ public void LogContextCanBeCloned()
             }
         }
 
+        [Fact]
+        public void ClonedLogContextCanSharedAcrossThreads()
+        {
+            LogEvent lastEvent = null;
+
+            var log = new LoggerConfiguration()
+                .Enrich.FromLogContext()
+                .WriteTo.Sink(new DelegatingSink(e => lastEvent = e))
+                .CreateLogger();
+
+            ILogEventEnricher clonedContext;
+            using (LogContext.PushProperty("A", 1))
+            {
+                clonedContext = LogContext.Clone();
+            }
+
+            var t = new Thread(() =>
+            {
+                using (LogContext.Push(clonedContext))
+                {
+                    log.Write(Some.InformationEvent());
+                }
+            });
+
+            t.Start();
+            t.Join();
+
+            Assert.Equal(1, lastEvent.Properties["A"].LiteralValue());
+        }
+
         [Fact]
         public void MoreNestedPropertiesOverrideLessNestedOnes()
         {