Clean up and test the seqcli forwarder ingestion log

seqcli.sln.DotSettings

@@ -18,6 +18,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=formattable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Gravatar/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hackily/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ingestionlog/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=mdash/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=nologo/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=n_0027est/@EntryIndexedValue">True</s:Boolean>

src/SeqCli/Connection/SeqConnectionFactory.cs → src/SeqCli/Api/SeqConnectionFactory.cs

@@ -16,9 +16,8 @@
 using Seq.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Encryptor;
 
-namespace SeqCli.Connection;
+namespace SeqCli.Api;
 
 static class SeqConnectionFactory
 {

src/SeqCli/Cli/Commands/ApiKey/CreateCommand.cs

@@ -19,9 +19,9 @@
 using Seq.Api.Model.LogEvents;
 using Seq.Api.Model.Security;
 using Seq.Api.Model.Shared;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 using SeqCli.Levels;
 using SeqCli.Util;
 using Serilog;

src/SeqCli/Cli/Commands/ApiKey/ListCommand.cs

@@ -15,9 +15,9 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 
 namespace SeqCli.Cli.Commands.ApiKey;
 

src/SeqCli/Cli/Commands/ApiKey/RemoveCommand.cs

@@ -15,9 +15,9 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 using Serilog;
 
 namespace SeqCli.Cli.Commands.ApiKey;

src/SeqCli/Cli/Commands/ApiKey/UpdateCommand.cs

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using Seq.Api;
-using SeqCli.Connection;
 
 namespace SeqCli.Cli.Commands.ApiKey;
 

src/SeqCli/Cli/Commands/App/InstallCommand.cs

@@ -16,9 +16,9 @@
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 using SeqCli.Util;
 using Serilog;
 

src/SeqCli/Cli/Commands/App/ListCommand.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 
 namespace SeqCli.Cli.Commands.App;
 

src/SeqCli/Cli/Commands/App/UninstallCommand.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 using SeqCli.Util;
 using Serilog;
 

src/SeqCli/Cli/Commands/App/UpdateCommand.cs

@@ -15,9 +15,9 @@
 using System;
 using System.Globalization;
 using System.Threading.Tasks;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 using SeqCli.Util;
 using Serilog;
 

src/SeqCli/Cli/Commands/AppInstance/CreateCommand.cs

@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Seq.Api.Model.AppInstances;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 using SeqCli.Signals;
 using SeqCli.Util;
 using Serilog;

src/SeqCli/Cli/Commands/AppInstance/ListCommand.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 
 namespace SeqCli.Cli.Commands.AppInstance;
 

src/SeqCli/Cli/Commands/AppInstance/RemoveCommand.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 using Serilog;
 
 namespace SeqCli.Cli.Commands.AppInstance;

src/SeqCli/Cli/Commands/AppInstance/UpdateCommand.cs

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using Seq.Api;
-using SeqCli.Connection;
 
 namespace SeqCli.Cli.Commands.AppInstance;
 

src/SeqCli/Cli/Commands/Bench/BenchCommand.cs

@@ -22,9 +22,9 @@
 using Seq.Api;
 using Seq.Api.Model.Data;
 using Seq.Api.Model.Signals;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 using SeqCli.Sample.Loader;
 using SeqCli.Util;
 using Serilog;

src/SeqCli/Cli/Commands/Cluster/HealthCommand.cs

@@ -18,9 +18,9 @@
 using Seq.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 using SeqCli.Util;
 using Seq.Api.Model.Cluster;
+using SeqCli.Api;
 using Serilog;
 
 namespace SeqCli.Cli.Commands.Cluster;

src/SeqCli/Cli/Commands/Dashboard/ListCommand.cs

@@ -15,9 +15,9 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 
 namespace SeqCli.Cli.Commands.Dashboard;
 

src/SeqCli/Cli/Commands/Dashboard/RemoveCommand.cs

@@ -15,9 +15,9 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 using Serilog;
 
 namespace SeqCli.Cli.Commands.Dashboard;

src/SeqCli/Cli/Commands/Dashboard/RenderCommand.cs

@@ -18,9 +18,9 @@
 using Newtonsoft.Json;
 using Seq.Api.Model.Dashboarding;
 using Seq.Api.Model.Signals;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 using SeqCli.Syntax;
 using SeqCli.Util;
 using Serilog;

src/SeqCli/Cli/Commands/Diagnostics/IngestionLogCommand.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Threading.Tasks;
+using SeqCli.Api;
+using SeqCli.Cli.Features;
+using SeqCli.Config;
+
+namespace SeqCli.Cli.Commands.Diagnostics;
+
+[Command("diagnostics", "ingestionlog", "Retrieve the ingestion log",
+    Example = "seqcli diagnostics ingestionlog")]
+class IngestionLogCommand : Command
+{
+    readonly ConnectionFeature _connection;
+    readonly StoragePathFeature _storagePath;
+
+    public IngestionLogCommand()
+    {
+        _connection = Enable<ConnectionFeature>();
+        _storagePath = Enable<StoragePathFeature>();
+    }
+
+    protected override async Task<int> Run()
+    {
+        var config = RuntimeConfigurationLoader.Load(_storagePath);
+        var connection = SeqConnectionFactory.Connect(_connection, config);
+
+        var ingestionLog = await connection.Diagnostics.GetIngestionLogAsync();
+        Console.WriteLine(ingestionLog);
+
+        return 0;
+    }
+}

src/SeqCli/Cli/Commands/ExpressionIndex/CreateCommand.cs

@@ -15,9 +15,9 @@
 using System;
 using System.Threading.Tasks;
 using Seq.Api.Model.Signals;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 using SeqCli.Signals;
 using SeqCli.Syntax;
 using SeqCli.Util;

src/SeqCli/Cli/Commands/ExpressionIndex/ListCommand.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Threading.Tasks;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 
 namespace SeqCli.Cli.Commands.ExpressionIndex;
 

src/SeqCli/Cli/Commands/ExpressionIndex/RemoveCommand.cs

@@ -13,9 +13,9 @@
 // limitations under the License.
 
 using System.Threading.Tasks;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 using Serilog;
 
 namespace SeqCli.Cli.Commands.ExpressionIndex;

src/SeqCli/Cli/Commands/Feed/CreateCommand.cs

@@ -14,9 +14,9 @@
 
 using System;
 using System.Threading.Tasks;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 using SeqCli.Util;
 using Serilog;
 

src/SeqCli/Cli/Commands/Feed/ListCommand.cs

@@ -15,9 +15,9 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 
 namespace SeqCli.Cli.Commands.Feed;
 

src/SeqCli/Cli/Commands/Feed/RemoveCommand.cs

@@ -15,9 +15,9 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 using Serilog;
 
 namespace SeqCli.Cli.Commands.Feed;

src/SeqCli/Cli/Commands/Feed/UpdateCommand.cs

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using Seq.Api;
-using SeqCli.Connection;
 
 namespace SeqCli.Cli.Commands.Feed;
 

src/SeqCli/Cli/Commands/Forwarder/RunCommand.cs

@@ -17,15 +17,16 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Net;
+using System.Threading;
 using System.Threading.Tasks;
 using Autofac;
 using Autofac.Extensions.DependencyInjection;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 using SeqCli.Forwarder;
 using SeqCli.Forwarder.Util;
 using SeqCli.Forwarder.Web.Api;
@@ -206,23 +207,45 @@ static async Task<int> RunStandardIOAsync(ServerService service, TextWriter cout
     {
         service.Start();
 
-        try
+        var waitForShutDownRequest = new TaskCompletionSource();
+        var done = new ManualResetEventSlim(false);
+
+        void ShutDown()
         {
-            Console.TreatControlCAsInput = true;
-            var k = Console.ReadKey(true);
-            while (k.Key != ConsoleKey.C || !k.Modifiers.HasFlag(ConsoleModifiers.Control))
-                k = Console.ReadKey(true);
+            waitForShutDownRequest.TrySetResult();
+            done.Wait();
+        }
 
-            cout.WriteLine("Ctrl+C pressed; stopping...");
+        try
+        {
             Console.TreatControlCAsInput = false;
+            Console.CancelKeyPress += (_, _) =>
+            {
+                cout.WriteLine("Ctrl+C pressed; stopping...");
+                Log.Information("Interrupt signal received");
+                ShutDown();
+            };
         }
-        catch (Exception ex)
+        catch (IOException)
         {
-            Log.Debug(ex, "Console not attached, waiting for any input");
-            Console.Read();
+            Log.Information("Disabling Ctrl+C handling; process is non-interactive");
         }
 
-        await service.StopAsync();
+        AppDomain.CurrentDomain.ProcessExit += (_, _) =>
+        {
+            Log.Information("Termination signal received");
+            ShutDown();
+        };
+
+        try
+        {
+            await waitForShutDownRequest.Task;
+            await service.StopAsync();
+        }
+        finally
+        {
+            done.Set();
+        }
 
         return 0;
     }

src/SeqCli/Cli/Commands/Index/ListCommand.cs

@@ -17,9 +17,9 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Seq.Api.Model.Indexes;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 
 namespace SeqCli.Cli.Commands.Index;