From ffb935700cc2d9ac47a81e43cf2187ff8c78957a Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 27 Apr 2017 14:11:56 -0400
Subject: [PATCH] update mono unhandled exception handler

---
 .../Logging/UnhandledExceptionWriter.cs                    | 6 ++++--
 MediaBrowser.Server.Mono/Program.cs                        | 7 ++++++-
 MediaBrowser.Server.Mono/app.config                        | 2 ++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Emby.Server.Implementations/Logging/UnhandledExceptionWriter.cs b/Emby.Server.Implementations/Logging/UnhandledExceptionWriter.cs
index 5183f3a0b6..6e96d83fd3 100644
--- a/Emby.Server.Implementations/Logging/UnhandledExceptionWriter.cs
+++ b/Emby.Server.Implementations/Logging/UnhandledExceptionWriter.cs
@@ -35,9 +35,11 @@ namespace Emby.Server.Implementations.Logging
 
             // Write to console just in case file logging fails
             _console.WriteLine("UnhandledException");
-            _console.WriteLine(builder.ToString());
 
-            _fileSystem.WriteAllText(path, builder.ToString());
+            var logMessage = builder.ToString();
+            _console.WriteLine(logMessage);
+
+            _fileSystem.WriteAllText(path, logMessage);
         }
     }
 }
diff --git a/MediaBrowser.Server.Mono/Program.cs b/MediaBrowser.Server.Mono/Program.cs
index 66851f7e94..dcd2dcaa67 100644
--- a/MediaBrowser.Server.Mono/Program.cs
+++ b/MediaBrowser.Server.Mono/Program.cs
@@ -258,7 +258,12 @@ namespace MediaBrowser.Server.Mono
 
             if (!Debugger.IsAttached)
             {
-                Environment.Exit(System.Runtime.InteropServices.Marshal.GetHRForException(exception));
+                var message = LogHelper.GetLogMessage(exception).ToString();
+
+                if (message.IndexOf("InotifyWatcher", StringComparison.OrdinalIgnoreCase) == -1)
+                {
+                    Environment.Exit(System.Runtime.InteropServices.Marshal.GetHRForException(exception));
+                }
             }
         }
 
diff --git a/MediaBrowser.Server.Mono/app.config b/MediaBrowser.Server.Mono/app.config
index 07c113f3e1..8f21d4a67f 100644
--- a/MediaBrowser.Server.Mono/app.config
+++ b/MediaBrowser.Server.Mono/app.config
@@ -11,6 +11,8 @@
     <add key="ReleaseProgramDataPath" value="ProgramData-Server" />
   </appSettings>
   <runtime>
+    <legacyUnhandledExceptionPolicy enabled="1" />
+    
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />