Simplify Sample Add-In to focus on log enrichment only

Author: augustoproiete

sample/SampleAddIn/AddIn.cs

@@ -13,9 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 using ExcelDna.Integration;
 using ExcelDna.Integration.Extensibility;
 using ExcelDna.Logging;
@@ -25,122 +22,35 @@ namespace SampleAddIn
 {
     public class AddIn : ExcelComAddIn, IExcelAddIn
     {
-        private static ILogger _log = Log.Logger;
-
         public void AutoOpen()
         {
-            try
-            {
-                Application.ThreadException += ApplicationThreadUnhandledException;
-                AppDomain.CurrentDomain.UnhandledException += AppDomainUnhandledException;
-                TaskScheduler.UnobservedTaskException += TaskSchedulerUnobservedTaskException;
-                ExcelIntegration.RegisterUnhandledExceptionHandler(ExcelUnhandledException);
-
-                _log = Log.Logger = ConfigureLogging();
-                _log.Information("Starting sample Excel-DNA Add-In with Serilog Enricher ExcelDna");
-
-                LogDisplay.Show();
-
-                _log.Information("Sample Excel-DNA Add-In with Serilog Enricher ExcelDna started");
-            }
-            catch (Exception ex)
-            {
-                ProcessUnhandledException(ex);
-            }
-        }
-
-        public void AutoClose()
-        {
-            // Do nothing
-        }
-
-        public override void OnDisconnection(ext_DisconnectMode disconnectMode, ref Array custom)
-        {
-            try
-            {
-                base.OnDisconnection(disconnectMode, ref custom);
-
-                _log.Information("Stopping sample Excel-DNA Add-In with Serilog Sink LogDisplay");
-            }
-            catch (Exception ex)
-            {
-                ProcessUnhandledException(ex);
-            }
-            finally
-            {
-                _log.Information("Sample Excel-DNA Add-In with Serilog Sink LogDisplay stopped");
-
-                Log.CloseAndFlush();
-            }
-        }
-
-        public static void ProcessUnhandledException(Exception ex)
-        {
-            try
-            {
-                _log.Error(ex, null);
-            }
-            catch (Exception lex)
-            {
-                try
-                {
-                    Serilog.Debugging.SelfLog.WriteLine(lex.ToString());
-                }
-                catch
-                {
-                    // Do nothing...
-                }
-            }
-
-            if (ex.InnerException != null)
-            {
-                ProcessUnhandledException(ex.InnerException);
-                return;
-            }
-
-#if DEBUG
-            MessageBox.Show(ex.ToString(), "Unexpected Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-#else
-            const string errorMessage = "An unexpected error ocurred. Please try again in a few minutes, and if the error persists, contact support";
-            MessageBox.Show(errorMessage, "Unexpected Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-#endif
-        }
-
-        private static ILogger ConfigureLogging()
-        {
-            AppDomain.CurrentDomain.ProcessExit += (sender, args) => Log.CloseAndFlush();
-
-            return new LoggerConfiguration()
+            Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Verbose()
-                .WriteTo.ExcelDnaLogDisplay(displayOrder: DisplayOrder.NewestFirst,
-                    outputTemplate: "{Properties:j}{NewLine}[{Level:u3}] {Message:lj}{NewLine}{Exception}")
                 .Enrich.WithXllPath()
                 .Enrich.WithExcelVersion()
                 .Enrich.WithExcelVersionName()
                 .Enrich.WithExcelBitness()
+                .WriteTo.ExcelDnaLogDisplay(displayOrder: DisplayOrder.NewestFirst,
+                    outputTemplate: "{Properties:j}{NewLine}[{Level:u3}] {Message:lj}{NewLine}{Exception}")
                 .CreateLogger();
-        }
 
-        private static void ApplicationThreadUnhandledException(object sender, ThreadExceptionEventArgs e)
-        {
-            ProcessUnhandledException(e.Exception);
-        }
+            Log.Information("Hello from {AddInName}! :)", DnaLibrary.CurrentLibrary.Name);
+            LogDisplay.Show();
 
-        private static void TaskSchedulerUnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs e)
-        {
-            ProcessUnhandledException(e.Exception);
-            e.SetObserved();
+            ExcelComAddInHelper.LoadComAddIn(this);
         }
 
-        private static void AppDomainUnhandledException(object sender, UnhandledExceptionEventArgs e)
+        public void AutoClose()
         {
-            ProcessUnhandledException((Exception)e.ExceptionObject);
+            // Do nothing
         }
 
-        private static object ExcelUnhandledException(object ex)
+        public override void OnDisconnection(ext_DisconnectMode disconnectMode, ref Array custom)
         {
-            ProcessUnhandledException((Exception)ex);
-            return ex;
+            Log.Information("Goodbye from {AddInName}! :)", DnaLibrary.CurrentLibrary.Name);
+            Log.CloseAndFlush();
+
+            base.OnDisconnection(disconnectMode, ref custom);
         }
     }
 }

sample/SampleAddIn/SampleAddIn.csproj

@@ -49,7 +49,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AddIn.cs" />

sample/SampleAddIn/SampleAddIn.dna

@@ -1,3 +1,3 @@
-<DnaLibrary Name="Sample Add-In" RuntimeVersion="v4.0" xmlns="http://schemas.excel-dna.net/addin/2018/05/dnalibrary">
+<DnaLibrary Name="Excel-DNA Enrichers Sample Add-In" RuntimeVersion="v4.0" xmlns="http://schemas.excel-dna.net/addin/2018/05/dnalibrary">
   <ExternalLibrary Path="SampleAddIn.dll" ExplicitExports="true" ExplicitRegistration="true" LoadFromBytes="false" Pack="false" />
 </DnaLibrary>