Enhanced event log processing

src/Seq.Client.EventLog.sln.DotSettings

@@ -0,0 +1,6 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=appname/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=guids/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Logons/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=TESTPC/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=uninstallation/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/Seq.Client.EventLog/App.config

@@ -1,21 +1,22 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
+
 <configuration>
-    <configSections>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="Seq.Client.EventLog.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-        </sectionGroup>
-    </configSections>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
-    </startup>
-    <applicationSettings>
-        <Seq.Client.EventLog.Properties.Settings>
-            <setting name="SeqUri" serializeAs="String">
-                <value>http://localhost:5341</value>
-            </setting>
-            <setting name="ApiKey" serializeAs="String">
-                <value />
-            </setting>
-        </Seq.Client.EventLog.Properties.Settings>
-    </applicationSettings>
+  <appSettings>
+    <!-- App name for logging purposes-->
+    <add key="AppName" value="Seq.Client.EventLog" />
+    <!-- Seq URL -->
+    <add key="LogSeqServer" value="https://Seq.domain.com" />
+    <!-- If empty, no API key will be used -->
+    <add key="LogSeqApiKey" value="" />
+    <!-- Log to file - defaults to true but can be disabled-->
+    <add key="LogToFile" value="true" />
+    <!-- Log folder for file logs ... if not specified, will attempt to log in a Logs folder under the exe location-->
+    <add key="LogFolder" value="" />
+    <!-- Heartbeat log entry interval in seconds, 0 disables heartbeat, default 600, maximum 86399 -->
+    <add key="HeartbeatInterval" value="600" />
+    <!-- If the Event Log service doesn't see any new log activity for the below number of heartbeats, it can restart the listener to recover-->
+    <add key="HeartbeatsBeforeReset" value="2"/>
+    <!-- Set IsDebug to true for additional heartbeat logging -->
+    <add key="IsDebug" value="false" />
+  </appSettings>
 </configuration>

src/Seq.Client.EventLog/Config.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Configuration;
+using System.IO;
+using System.Reflection;
+
+namespace Seq.Client.EventLog
+{
+    public static class Config
+    {
+        static Config()
+        {
+            AppName = ConfigurationManager.AppSettings["AppName"];
+            SeqServer = ConfigurationManager.AppSettings["LogSeqServer"];
+            SeqApiKey = ConfigurationManager.AppSettings["LogSeqApiKey"];
+            LogToFile = GetBool(ConfigurationManager.AppSettings["LogToFile"], true);
+            LogFolder = ConfigurationManager.AppSettings["LogFolder"];
+            HeartbeatInterval = GetInt(ConfigurationManager.AppSettings["HeartbeatInterval"]);
+            HeartbeatsBeforeReset = GetInt(ConfigurationManager.AppSettings["HeartbeatsBeforeReset"]);
+
+            //Minimum is 0 (disabled)
+            if (HeartbeatInterval < 0)
+                HeartbeatInterval = 600;
+            //Maximum is 3600
+            if (HeartbeatInterval > 3600)
+                HeartbeatInterval = 3600;
+
+            if (HeartbeatsBeforeReset < 0)
+                HeartbeatsBeforeReset = 0;
+
+            IsDebug = GetBool(ConfigurationManager.AppSettings["IsDebug"]);
+
+            var isSuccess = true;
+            try
+            {
+                if (string.IsNullOrEmpty(AppName))
+                    AppName = Assembly.GetEntryAssembly()?.GetName().Name;
+
+                AppVersion = Assembly.GetEntryAssembly()?.GetName().Version.ToString();
+                if (string.IsNullOrEmpty(LogFolder))
+                    LogFolder = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
+            }
+            catch
+            {
+                isSuccess = false;
+            }
+
+            if (isSuccess) return;
+            try
+            {
+                if (string.IsNullOrEmpty(AppName))
+                    AppName = Assembly.GetExecutingAssembly().GetName().Name;
+
+                AppVersion = Assembly.GetExecutingAssembly().GetName().Version.ToString();
+                if (string.IsNullOrEmpty(LogFolder))
+                    LogFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().GetName().CodeBase);
+            }
+            catch
+            {
+                //We surrender ...
+                AppVersion = string.Empty;
+            }
+        }
+
+        public static string AppName { get; }
+        public static string AppVersion { get; }
+        public static string SeqServer { get; }
+        public static string SeqApiKey { get; }
+        public static bool LogToFile { get; }
+        public static string LogFolder { get; }
+        public static int HeartbeatInterval { get; }
+        public static bool IsDebug { get; }
+        public static int HeartbeatsBeforeReset { get; }
+
+        /// <summary>
+        ///     Convert the supplied <see cref="object" /> to an <see cref="int" />
+        ///     <para />
+        ///     This will filter out nulls that could otherwise cause exceptions
+        /// </summary>
+        /// <param name="sourceObject">An object that can be converted to an int</param>
+        /// <returns></returns>
+        public static int GetInt(object sourceObject)
+        {
+            var sourceString = string.Empty;
+
+            if (!Convert.IsDBNull(sourceObject)) sourceString = (string) sourceObject;
+
+            if (int.TryParse(sourceString, out var destInt)) return destInt;
+
+            return -1;
+        }
+
+        /// <summary>
+        ///     Convert the supplied <see cref="object" /> to a <see cref="bool" />
+        ///     <para />
+        ///     This will filter out nulls that could otherwise cause exceptions
+        /// </summary>
+        /// <param name="sourceObject">An object that can be converted to a bool</param>
+        /// <param name="trueIfEmpty">Return true if the object is empty</param>
+        /// <returns></returns>
+        private static bool GetBool(object sourceObject, bool trueIfEmpty = false)
+        {
+            var sourceString = string.Empty;
+
+            if (!Convert.IsDBNull(sourceObject)) sourceString = (string) sourceObject;
+
+            return bool.TryParse(sourceString, out var destBool) ? destBool : trueIfEmpty;
+        }
+    }
+}

src/Seq.Client.EventLog/EventLogClient.cs

@@ -1,68 +1,19 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using Newtonsoft.Json;
-using Serilog;
-
-namespace Seq.Client.EventLog
+namespace Seq.Client.EventLog
 {
-    class EventLogClient
+    internal class EventLogClient
     {
-        private List<EventLogListener> _eventLogListeners;
-
-        public void Start(string configuration = null)
-        {
-            LoadListeners(configuration);
-            ValidateListeners();
-            StartListeners();
-        }
-
-        public void Stop()
-        {
-            StopListeners();
-        }
-
-        private void LoadListeners(string configuration)
-        {
-            string filePath;
-            if (configuration == null)
-            {
-                var directory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-                filePath = Path.Combine(directory ?? ".", "EventLogListeners.json");
-            }
-            else
-            {
-                filePath = configuration;
-            }
-
-            Log.Information("Loading listener configuration from {ConfigurationFilePath}", filePath);
-            var file = File.ReadAllText(filePath);
-
-            _eventLogListeners = JsonConvert.DeserializeObject<List<EventLogListener>>(file);
-        }
-
-        private void ValidateListeners()
-        {
-            foreach (var listener in _eventLogListeners)
-            {
-                listener.Validate();
-            }
-        }
-
-        private void StartListeners()
+        public static void Start(bool isInteractive = false, string configuration = null)
         {
-            foreach (var listener in _eventLogListeners)
-            {
-                listener.Start();
-            }
+            ServiceManager.LoadListeners(configuration);
+            ServiceManager.ValidateListeners();
+            ServiceManager.StartListeners(isInteractive);
         }
 
-        private void StopListeners()
+        public static void Stop()
         {
-            foreach (var listener in _eventLogListeners)
-            {
-                listener.Stop();
-            }
+            ServiceManager.StopListeners();
+            if (ServiceManager.SaveBookmarks)
+                ServiceManager.SaveListeners();
         }
     }
-}
+}