Sharing on netstandard1.3; dispose _mutex; ten second timeout waiting for mutex acquisition

Author: nblumhardt

example/Sample/Program.cs

@@ -14,7 +14,7 @@ public static void Main(string[] args)
             var sw = System.Diagnostics.Stopwatch.StartNew();
 
             Log.Logger = new LoggerConfiguration()
-                .WriteTo.File("log.txt", shared: true)
+                .WriteTo.File("log.txt")
                 .CreateLogger();
 
             for (var i = 0; i < 1000000; ++i)

src/Serilog.Sinks.File/FileLoggerConfigurationExtensions.cs

@@ -180,32 +180,20 @@ static LoggerConfiguration ConfigureFile(
             if (formatter == null) throw new ArgumentNullException(nameof(formatter));
             if (path == null) throw new ArgumentNullException(nameof(path));
             if (fileSizeLimitBytes.HasValue && fileSizeLimitBytes < 0) throw new ArgumentException("Negative value provided; file size limit must be non-negative");
-
-            if (shared)
-            {
-#if SHARING
-                if (buffered)
-                    throw new ArgumentException("Buffered writes are not available when file sharing is enabled.", nameof(buffered));
-#else
-                throw new NotSupportedException("File sharing is not supported on this platform.");
-#endif
-            }
+            if (shared && buffered)
+                throw new ArgumentException("Buffered writes are not available when file sharing is enabled.", nameof(buffered));
 
             ILogEventSink sink;
             try
             {
-#if SHARING
                 if (shared)
                 {
                     sink = new SharedFileSink(path, formatter, fileSizeLimitBytes);
                 }
                 else
                 {
-#endif
                     sink = new FileSink(path, formatter, fileSizeLimitBytes, buffered: buffered);
-#if SHARING
                 }
-#endif
             }
             catch (Exception ex)
             {

src/Serilog.Sinks.File/Sinks/File/SharedFileSink.OSMutex.cs

@@ -21,6 +21,7 @@
 using Serilog.Events;
 using Serilog.Formatting;
 using System.Threading;
+using Serilog.Debugging;
 
 namespace Serilog.Sinks.File
 {
@@ -36,6 +37,7 @@ public sealed class SharedFileSink : ILogEventSink, IFlushableFileSink, IDisposa
         readonly object _syncRoot = new object();
 
         const string MutexNameSuffix = ".serilog";
+        const int MutexWaitTimeout = 10000;
         readonly Mutex _mutex;
 
         /// <summary>Construct a <see cref="FileSink"/>.</summary>
@@ -80,7 +82,12 @@ public void Emit(LogEvent logEvent)
 
             lock (_syncRoot)
             {
-                _mutex.WaitOne();
+                if (!_mutex.WaitOne(MutexWaitTimeout))
+                {
+                    SelfLog.WriteLine("Shared file mutex could not be acquired in {0} ms for event emitting", MutexWaitTimeout);
+                    return;
+                }
+
                 try
                 {
                     _underlyingStream.Seek(0, SeekOrigin.End);
@@ -107,6 +114,7 @@ public void Dispose()
             lock (_syncRoot)
             {
                 _output.Dispose();
+                _mutex.Dispose();
             }
         }
 
@@ -115,7 +123,12 @@ public void FlushToDisk()
         {
             lock (_syncRoot)
             {
-                _mutex.WaitOne();
+                if (!_mutex.WaitOne(MutexWaitTimeout))
+                {
+                    SelfLog.WriteLine("Shared file mutex could not be acquired in {0} ms for disk flush operation", MutexWaitTimeout);
+                    return;
+                }
+
                 try
                 {
                     _underlyingStream.Flush(true);

src/Serilog.Sinks.File/project.json

@@ -17,10 +17,10 @@
   },
   "frameworks": {
     "net4.5": {
-      "buildOptions": { "define": [ "SHARING", "ATOMIC_APPEND" ] }
+      "buildOptions": { "define": [ "ATOMIC_APPEND" ] }
     },
-    "netcoreapp1.0": {
-      "buildOptions": { "define": [ "SHARING", "OS_MUTEX" ] },
+    "netstandard1.3": {
+      "buildOptions": { "define": [ "OS_MUTEX" ] },
       "dependencies": {
         "System.IO": "4.1.0",
         "System.IO.FileSystem": "4.0.1",
@@ -29,15 +29,6 @@
         "System.Threading.Timer": "4.0.1",
         "System.Threading": "4.0.11"
       }
-    },
-    "netstandard1.3": {
-      "dependencies": {
-        "System.IO": "4.1.0",
-        "System.IO.FileSystem": "4.0.1",
-        "System.IO.FileSystem.Primitives": "4.0.1",
-        "System.Text.Encoding.Extensions": "4.0.11",
-        "System.Threading.Timer": "4.0.1"
-      }
     }
   }
 }