From 6494bbf65ddedc4c909aa610155a3a0c33ee5e1f Mon Sep 17 00:00:00 2001 From: Liam McLennan Date: Thu, 29 Feb 2024 12:46:43 +1000 Subject: [PATCH 1/5] Add forwarder config --- src/SeqCli/Cli/Commands/Forward/RunCommand.cs | 1 + src/SeqCli/Config/SeqCliApiConfig.cs | 6 ++++ src/SeqCli/Config/SeqCliConfig.cs | 6 +++- src/SeqCli/Config/SeqCliConnectionConfig.cs | 3 ++ src/SeqCli/Config/SeqCliDiagnosticConfig.cs | 29 +++++++++++++++++++ src/SeqCli/Config/SeqCliStorageConfig.cs | 6 ++++ 6 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 src/SeqCli/Config/SeqCliApiConfig.cs create mode 100644 src/SeqCli/Config/SeqCliDiagnosticConfig.cs create mode 100644 src/SeqCli/Config/SeqCliStorageConfig.cs diff --git a/src/SeqCli/Cli/Commands/Forward/RunCommand.cs b/src/SeqCli/Cli/Commands/Forward/RunCommand.cs index f2b0ed66..ba8d4c6d 100644 --- a/src/SeqCli/Cli/Commands/Forward/RunCommand.cs +++ b/src/SeqCli/Cli/Commands/Forward/RunCommand.cs @@ -1,3 +1,4 @@ +using System; using SeqCli.Cli.Features; using SeqCli.Config; using SeqCli.Connection; diff --git a/src/SeqCli/Config/SeqCliApiConfig.cs b/src/SeqCli/Config/SeqCliApiConfig.cs new file mode 100644 index 00000000..24e45650 --- /dev/null +++ b/src/SeqCli/Config/SeqCliApiConfig.cs @@ -0,0 +1,6 @@ +namespace SeqCli.Config; + +class SeqCliApiConfig +{ + public string ListenUri { get; set; } = "http://localhost:15341"; +} \ No newline at end of file diff --git a/src/SeqCli/Config/SeqCliConfig.cs b/src/SeqCli/Config/SeqCliConfig.cs index dd3b51ca..718835ce 100644 --- a/src/SeqCli/Config/SeqCliConfig.cs +++ b/src/SeqCli/Config/SeqCliConfig.cs @@ -52,7 +52,11 @@ public static void Write(SeqCliConfig data) } public SeqCliConnectionConfig Connection { get; set; } = new SeqCliConnectionConfig(); - public SeqCliOutputConfig Output { get; set; } = new SeqCliOutputConfig(); + public SeqCliOutputConfig Output { get; set; } = new(); + public SeqCliStorageConfig Storage { get; set; } = new(); + public SeqCliDiagnosticConfig Diagnostics { get; set; } = new(); + public SeqCliApiConfig Api { get; set; } = new(); + public Dictionary Profiles { get; } = new Dictionary(StringComparer.OrdinalIgnoreCase); } \ No newline at end of file diff --git a/src/SeqCli/Config/SeqCliConnectionConfig.cs b/src/SeqCli/Config/SeqCliConnectionConfig.cs index 072d733e..b6d64eee 100644 --- a/src/SeqCli/Config/SeqCliConnectionConfig.cs +++ b/src/SeqCli/Config/SeqCliConnectionConfig.cs @@ -23,6 +23,9 @@ class SeqCliConnectionConfig const string ProtectedDataPrefix = "pd."; public string ServerUrl { get; set; } = "http://localhost:5341"; + public ulong EventBodyLimitBytes { get; set; } = 256 * 1024; + public ulong RawPayloadLimitBytes { get; set; } = 10 * 1024 * 1024; + public uint? PooledConnectionLifetimeMilliseconds { get; set; } = null; [JsonProperty("apiKey")] public string? EncodedApiKey { get; set; } diff --git a/src/SeqCli/Config/SeqCliDiagnosticConfig.cs b/src/SeqCli/Config/SeqCliDiagnosticConfig.cs new file mode 100644 index 00000000..a5645c76 --- /dev/null +++ b/src/SeqCli/Config/SeqCliDiagnosticConfig.cs @@ -0,0 +1,29 @@ +using System; +using System.IO; +using Serilog.Events; + +namespace SeqCli.Config; + +class SeqCliDiagnosticConfig +{ + public string InternalLogPath { get; set; } = GetDefaultInternalLogPath(); + public LogEventLevel InternalLoggingLevel { get; set; } = LogEventLevel.Information; + public string? InternalLogServerUri { get; set; } + public string? InternalLogServerApiKey { get; set; } + public bool IngestionLogShowDetail { get; set; } + + public static string GetDefaultInternalLogPath() + { + return Path.Combine( +#if WINDOWS + // Common, here, because the service may run as Local Service, which has no obvious home + // directory. + Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), +#else + // Specific to and writable by the current user. + Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), +#endif + "Seq", + "Logs"); + } +} \ No newline at end of file diff --git a/src/SeqCli/Config/SeqCliStorageConfig.cs b/src/SeqCli/Config/SeqCliStorageConfig.cs new file mode 100644 index 00000000..61e1223a --- /dev/null +++ b/src/SeqCli/Config/SeqCliStorageConfig.cs @@ -0,0 +1,6 @@ +namespace SeqCli.Config; + +public class SeqCliStorageConfig +{ + public long BufferSizeBytes { get; set; } = 67_108_864; +} \ No newline at end of file From 368412698d0384fedac31685f6e61c68f855a541 Mon Sep 17 00:00:00 2001 From: Liam McLennan Date: Thu, 29 Feb 2024 14:13:32 +1000 Subject: [PATCH 2/5] Move forwarder config to forwarder. --- src/SeqCli/Cli/Commands/Forward/RunCommand.cs | 2 - src/SeqCli/Cli/Features/StoragePathFeature.cs | 58 ------------------- src/SeqCli/Config/SeqCliConfig.cs | 4 +- src/SeqCli/Config/SeqCliConnectionConfig.cs | 3 - src/SeqCli/Config/SeqCliDiagnosticConfig.cs | 2 +- src/SeqCli/Config/SeqCliForwarderConfig.cs | 12 ++++ src/SeqCli/Config/SeqCliOutputConfig.cs | 2 +- src/SeqCli/Config/SeqCliStorageConfig.cs | 2 +- src/SeqCli/SeqCli.csproj | 14 +++++ 9 files changed, 30 insertions(+), 69 deletions(-) delete mode 100644 src/SeqCli/Cli/Features/StoragePathFeature.cs create mode 100644 src/SeqCli/Config/SeqCliForwarderConfig.cs diff --git a/src/SeqCli/Cli/Commands/Forward/RunCommand.cs b/src/SeqCli/Cli/Commands/Forward/RunCommand.cs index ba8d4c6d..ca1627ed 100644 --- a/src/SeqCli/Cli/Commands/Forward/RunCommand.cs +++ b/src/SeqCli/Cli/Commands/Forward/RunCommand.cs @@ -12,13 +12,11 @@ class RunCommand : Command #pragma warning disable CS0414 // Field is assigned but its value is never used bool _noLogo; #pragma warning restore CS0414 // Field is assigned but its value is never used - readonly StoragePathFeature _storagePath; readonly ListenUriFeature _listenUri; public RunCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config) { Options.Add("nologo", _ => _noLogo = true); - _storagePath = Enable(); _listenUri = Enable(); } } \ No newline at end of file diff --git a/src/SeqCli/Cli/Features/StoragePathFeature.cs b/src/SeqCli/Cli/Features/StoragePathFeature.cs deleted file mode 100644 index ce363a44..00000000 --- a/src/SeqCli/Cli/Features/StoragePathFeature.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.IO; - -namespace SeqCli.Cli.Features; - -class StoragePathFeature : CommandFeature -{ - string? _storageRoot; - - public string StorageRootPath - { - get - { - if (!string.IsNullOrWhiteSpace(_storageRoot)) - return _storageRoot; - - return TryQueryInstalledStorageRoot() ?? GetDefaultStorageRoot(); - } - } - - public string ConfigFilePath => Path.Combine(StorageRootPath, "SeqForwarder.json"); - - public string BufferPath => Path.Combine(StorageRootPath, "Buffer"); - - public override void Enable(OptionSet options) - { - options.Add("s=|storage=", - "Set the folder where data will be stored; " + - "" + GetDefaultStorageRoot() + " is used by default.", - v => _storageRoot = Path.GetFullPath(v)); - } - - static string GetDefaultStorageRoot() - { - return Path.GetFullPath(Path.Combine( -#if WINDOWS - // Common, here, because the service may run as Local Service, which has no obvious home - // directory. - Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), -#else - // Specific to and writable by the current user. - Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), -#endif - "Seq", - "Forwarder")); - } - - static string? TryQueryInstalledStorageRoot() - { -#if WINDOWS - // if (Seq.Forwarder.Util.ServiceConfiguration.GetServiceStoragePath( - // Seq.Forwarder.ServiceProcess.SeqForwarderWindowsService.WindowsServiceName, out var storage)) - // return storage; -#endif - - return null; - } -} \ No newline at end of file diff --git a/src/SeqCli/Config/SeqCliConfig.cs b/src/SeqCli/Config/SeqCliConfig.cs index 718835ce..196aadf4 100644 --- a/src/SeqCli/Config/SeqCliConfig.cs +++ b/src/SeqCli/Config/SeqCliConfig.cs @@ -53,9 +53,7 @@ public static void Write(SeqCliConfig data) public SeqCliConnectionConfig Connection { get; set; } = new SeqCliConnectionConfig(); public SeqCliOutputConfig Output { get; set; } = new(); - public SeqCliStorageConfig Storage { get; set; } = new(); - public SeqCliDiagnosticConfig Diagnostics { get; set; } = new(); - public SeqCliApiConfig Api { get; set; } = new(); + public SeqCliForwarderConfig Forwarder { get; set; } = new(); public Dictionary Profiles { get; } = new Dictionary(StringComparer.OrdinalIgnoreCase); diff --git a/src/SeqCli/Config/SeqCliConnectionConfig.cs b/src/SeqCli/Config/SeqCliConnectionConfig.cs index b6d64eee..072d733e 100644 --- a/src/SeqCli/Config/SeqCliConnectionConfig.cs +++ b/src/SeqCli/Config/SeqCliConnectionConfig.cs @@ -23,9 +23,6 @@ class SeqCliConnectionConfig const string ProtectedDataPrefix = "pd."; public string ServerUrl { get; set; } = "http://localhost:5341"; - public ulong EventBodyLimitBytes { get; set; } = 256 * 1024; - public ulong RawPayloadLimitBytes { get; set; } = 10 * 1024 * 1024; - public uint? PooledConnectionLifetimeMilliseconds { get; set; } = null; [JsonProperty("apiKey")] public string? EncodedApiKey { get; set; } diff --git a/src/SeqCli/Config/SeqCliDiagnosticConfig.cs b/src/SeqCli/Config/SeqCliDiagnosticConfig.cs index a5645c76..83e2207a 100644 --- a/src/SeqCli/Config/SeqCliDiagnosticConfig.cs +++ b/src/SeqCli/Config/SeqCliDiagnosticConfig.cs @@ -4,7 +4,7 @@ namespace SeqCli.Config; -class SeqCliDiagnosticConfig +public class SeqCliForwarderDiagnosticConfig { public string InternalLogPath { get; set; } = GetDefaultInternalLogPath(); public LogEventLevel InternalLoggingLevel { get; set; } = LogEventLevel.Information; diff --git a/src/SeqCli/Config/SeqCliForwarderConfig.cs b/src/SeqCli/Config/SeqCliForwarderConfig.cs new file mode 100644 index 00000000..5969c506 --- /dev/null +++ b/src/SeqCli/Config/SeqCliForwarderConfig.cs @@ -0,0 +1,12 @@ +namespace SeqCli.Config; + +class SeqCliForwarderConfig +{ + public uint? PooledConnectionLifetimeMilliseconds { get; set; } = null; + public ulong EventBodyLimitBytes { get; set; } = 256 * 1024; + public ulong PayloadLimitBytes { get; set; } = 10 * 1024 * 1024; + + public SeqCliStorageConfig Storage { get; set; } = new(); + public SeqCliForwarderDiagnosticConfig Diagnostics { get; set; } = new(); + public SeqCliApiConfig Api { get; set; } = new(); +} \ No newline at end of file diff --git a/src/SeqCli/Config/SeqCliOutputConfig.cs b/src/SeqCli/Config/SeqCliOutputConfig.cs index 62b3a6f2..4ba79472 100644 --- a/src/SeqCli/Config/SeqCliOutputConfig.cs +++ b/src/SeqCli/Config/SeqCliOutputConfig.cs @@ -14,7 +14,7 @@ namespace SeqCli.Config; -class SeqCliOutputConfig +public class SeqCliOutputConfig { public bool DisableColor { get; set; } public bool ForceColor { get; set; } diff --git a/src/SeqCli/Config/SeqCliStorageConfig.cs b/src/SeqCli/Config/SeqCliStorageConfig.cs index 61e1223a..ae803813 100644 --- a/src/SeqCli/Config/SeqCliStorageConfig.cs +++ b/src/SeqCli/Config/SeqCliStorageConfig.cs @@ -2,5 +2,5 @@ namespace SeqCli.Config; public class SeqCliStorageConfig { - public long BufferSizeBytes { get; set; } = 67_108_864; + public int BufferSizeBytes { get; set; } = 67_108_864; } \ No newline at end of file diff --git a/src/SeqCli/SeqCli.csproj b/src/SeqCli/SeqCli.csproj index 54e9377f..03ea7a9c 100644 --- a/src/SeqCli/SeqCli.csproj +++ b/src/SeqCli/SeqCli.csproj @@ -60,4 +60,18 @@ + + + + + + + + + + + + + + From a0e05c70ea3fe23841b9d4b79271002ce8150a8e Mon Sep 17 00:00:00 2001 From: Liam McLennan Date: Thu, 29 Feb 2024 14:16:04 +1000 Subject: [PATCH 3/5] Rename configs --- src/SeqCli/Cli/Commands/ConfigCommand.cs | 2 +- src/SeqCli/Cli/Commands/Node/ListCommand.cs | 2 +- src/SeqCli/Cli/Commands/PrintCommand.cs | 2 +- src/SeqCli/Cli/Commands/Profile/CreateCommand.cs | 2 +- src/SeqCli/Cli/Features/OutputFormatFeature.cs | 2 +- .../{SeqCliConnectionConfig.cs => ConnectionConfig.cs} | 2 +- .../{SeqCliApiConfig.cs => ForwarderApiConfig.cs} | 2 +- .../{SeqCliForwarderConfig.cs => ForwarderConfig.cs} | 8 ++++---- ...eqCliStorageConfig.cs => ForwarderStorageConfig.cs} | 2 +- .../Config/{SeqCliOutputConfig.cs => OutputConfig.cs} | 2 +- src/SeqCli/Config/SeqCliConfig.cs | 10 +++++----- src/SeqCli/Config/SeqCliDiagnosticConfig.cs | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) rename src/SeqCli/Config/{SeqCliConnectionConfig.cs => ConnectionConfig.cs} (98%) rename src/SeqCli/Config/{SeqCliApiConfig.cs => ForwarderApiConfig.cs} (79%) rename src/SeqCli/Config/{SeqCliForwarderConfig.cs => ForwarderConfig.cs} (52%) rename src/SeqCli/Config/{SeqCliStorageConfig.cs => ForwarderStorageConfig.cs} (70%) rename src/SeqCli/Config/{SeqCliOutputConfig.cs => OutputConfig.cs} (95%) diff --git a/src/SeqCli/Cli/Commands/ConfigCommand.cs b/src/SeqCli/Cli/Commands/ConfigCommand.cs index 5ec9beec..f991dc44 100644 --- a/src/SeqCli/Cli/Commands/ConfigCommand.cs +++ b/src/SeqCli/Cli/Commands/ConfigCommand.cs @@ -107,7 +107,7 @@ static void Set(SeqCliConfig config, string key, string? value) if (first == null) throw new ArgumentException("The key could not be found; run the command without any arguments to view all keys."); - if (first.PropertyType == typeof(Dictionary)) + if (first.PropertyType == typeof(Dictionary)) throw new NotSupportedException("Use `seqcli profile create` to configure connection profiles."); var second = first.PropertyType.GetTypeInfo().DeclaredProperties diff --git a/src/SeqCli/Cli/Commands/Node/ListCommand.cs b/src/SeqCli/Cli/Commands/Node/ListCommand.cs index bf030933..9b24b03c 100644 --- a/src/SeqCli/Cli/Commands/Node/ListCommand.cs +++ b/src/SeqCli/Cli/Commands/Node/ListCommand.cs @@ -32,7 +32,7 @@ class ListCommand : Command string? _name, _id; - public ListCommand(SeqConnectionFactory connectionFactory, SeqCliOutputConfig outputConfig) + public ListCommand(SeqConnectionFactory connectionFactory, OutputConfig outputConfig) { _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory)); diff --git a/src/SeqCli/Cli/Commands/PrintCommand.cs b/src/SeqCli/Cli/Commands/PrintCommand.cs index a5d24dda..2a96e68a 100644 --- a/src/SeqCli/Cli/Commands/PrintCommand.cs +++ b/src/SeqCli/Cli/Commands/PrintCommand.cs @@ -38,7 +38,7 @@ class PrintCommand : Command string? _filter, _template = OutputFormatFeature.DefaultOutputTemplate; bool _noColor, _forceColor; - public PrintCommand(SeqCliOutputConfig outputConfig) + public PrintCommand(OutputConfig outputConfig) { if (outputConfig == null) throw new ArgumentNullException(nameof(outputConfig)); _noColor = outputConfig.DisableColor; diff --git a/src/SeqCli/Cli/Commands/Profile/CreateCommand.cs b/src/SeqCli/Cli/Commands/Profile/CreateCommand.cs index 83d32e21..d6769739 100644 --- a/src/SeqCli/Cli/Commands/Profile/CreateCommand.cs +++ b/src/SeqCli/Cli/Commands/Profile/CreateCommand.cs @@ -49,7 +49,7 @@ int RunSync() try { var config = SeqCliConfig.Read(); - config.Profiles[_name] = new SeqCliConnectionConfig { ServerUrl = _url, ApiKey = _apiKey }; + config.Profiles[_name] = new ConnectionConfig { ServerUrl = _url, ApiKey = _apiKey }; SeqCliConfig.Write(config); return 0; } diff --git a/src/SeqCli/Cli/Features/OutputFormatFeature.cs b/src/SeqCli/Cli/Features/OutputFormatFeature.cs index f64ef386..ac6a237f 100644 --- a/src/SeqCli/Cli/Features/OutputFormatFeature.cs +++ b/src/SeqCli/Cli/Features/OutputFormatFeature.cs @@ -40,7 +40,7 @@ class OutputFormatFeature : CommandFeature bool _json, _noColor, _forceColor; - public OutputFormatFeature(SeqCliOutputConfig outputConfig) + public OutputFormatFeature(OutputConfig outputConfig) { _noColor = outputConfig.DisableColor; _forceColor = outputConfig.ForceColor; diff --git a/src/SeqCli/Config/SeqCliConnectionConfig.cs b/src/SeqCli/Config/ConnectionConfig.cs similarity index 98% rename from src/SeqCli/Config/SeqCliConnectionConfig.cs rename to src/SeqCli/Config/ConnectionConfig.cs index 072d733e..57b6fd50 100644 --- a/src/SeqCli/Config/SeqCliConnectionConfig.cs +++ b/src/SeqCli/Config/ConnectionConfig.cs @@ -18,7 +18,7 @@ namespace SeqCli.Config; -class SeqCliConnectionConfig +class ConnectionConfig { const string ProtectedDataPrefix = "pd."; diff --git a/src/SeqCli/Config/SeqCliApiConfig.cs b/src/SeqCli/Config/ForwarderApiConfig.cs similarity index 79% rename from src/SeqCli/Config/SeqCliApiConfig.cs rename to src/SeqCli/Config/ForwarderApiConfig.cs index 24e45650..321e8017 100644 --- a/src/SeqCli/Config/SeqCliApiConfig.cs +++ b/src/SeqCli/Config/ForwarderApiConfig.cs @@ -1,6 +1,6 @@ namespace SeqCli.Config; -class SeqCliApiConfig +class ForwarderApiConfig { public string ListenUri { get; set; } = "http://localhost:15341"; } \ No newline at end of file diff --git a/src/SeqCli/Config/SeqCliForwarderConfig.cs b/src/SeqCli/Config/ForwarderConfig.cs similarity index 52% rename from src/SeqCli/Config/SeqCliForwarderConfig.cs rename to src/SeqCli/Config/ForwarderConfig.cs index 5969c506..621072cc 100644 --- a/src/SeqCli/Config/SeqCliForwarderConfig.cs +++ b/src/SeqCli/Config/ForwarderConfig.cs @@ -1,12 +1,12 @@ namespace SeqCli.Config; -class SeqCliForwarderConfig +class ForwarderConfig { public uint? PooledConnectionLifetimeMilliseconds { get; set; } = null; public ulong EventBodyLimitBytes { get; set; } = 256 * 1024; public ulong PayloadLimitBytes { get; set; } = 10 * 1024 * 1024; - public SeqCliStorageConfig Storage { get; set; } = new(); - public SeqCliForwarderDiagnosticConfig Diagnostics { get; set; } = new(); - public SeqCliApiConfig Api { get; set; } = new(); + public ForwarderStorageConfig Storage { get; set; } = new(); + public ForwarderDiagnosticConfig Diagnostics { get; set; } = new(); + public ForwarderApiConfig Api { get; set; } = new(); } \ No newline at end of file diff --git a/src/SeqCli/Config/SeqCliStorageConfig.cs b/src/SeqCli/Config/ForwarderStorageConfig.cs similarity index 70% rename from src/SeqCli/Config/SeqCliStorageConfig.cs rename to src/SeqCli/Config/ForwarderStorageConfig.cs index ae803813..f2143eaa 100644 --- a/src/SeqCli/Config/SeqCliStorageConfig.cs +++ b/src/SeqCli/Config/ForwarderStorageConfig.cs @@ -1,6 +1,6 @@ namespace SeqCli.Config; -public class SeqCliStorageConfig +public class ForwarderStorageConfig { public int BufferSizeBytes { get; set; } = 67_108_864; } \ No newline at end of file diff --git a/src/SeqCli/Config/SeqCliOutputConfig.cs b/src/SeqCli/Config/OutputConfig.cs similarity index 95% rename from src/SeqCli/Config/SeqCliOutputConfig.cs rename to src/SeqCli/Config/OutputConfig.cs index 4ba79472..8727c2b3 100644 --- a/src/SeqCli/Config/SeqCliOutputConfig.cs +++ b/src/SeqCli/Config/OutputConfig.cs @@ -14,7 +14,7 @@ namespace SeqCli.Config; -public class SeqCliOutputConfig +public class OutputConfig { public bool DisableColor { get; set; } public bool ForceColor { get; set; } diff --git a/src/SeqCli/Config/SeqCliConfig.cs b/src/SeqCli/Config/SeqCliConfig.cs index 196aadf4..307f14b8 100644 --- a/src/SeqCli/Config/SeqCliConfig.cs +++ b/src/SeqCli/Config/SeqCliConfig.cs @@ -51,10 +51,10 @@ public static void Write(SeqCliConfig data) File.WriteAllText(DefaultConfigFilename, content); } - public SeqCliConnectionConfig Connection { get; set; } = new SeqCliConnectionConfig(); - public SeqCliOutputConfig Output { get; set; } = new(); - public SeqCliForwarderConfig Forwarder { get; set; } = new(); + public ConnectionConfig Connection { get; set; } = new ConnectionConfig(); + public OutputConfig Output { get; set; } = new(); + public ForwarderConfig Forwarder { get; set; } = new(); - public Dictionary Profiles { get; } = - new Dictionary(StringComparer.OrdinalIgnoreCase); + public Dictionary Profiles { get; } = + new Dictionary(StringComparer.OrdinalIgnoreCase); } \ No newline at end of file diff --git a/src/SeqCli/Config/SeqCliDiagnosticConfig.cs b/src/SeqCli/Config/SeqCliDiagnosticConfig.cs index 83e2207a..8366a6e4 100644 --- a/src/SeqCli/Config/SeqCliDiagnosticConfig.cs +++ b/src/SeqCli/Config/SeqCliDiagnosticConfig.cs @@ -4,7 +4,7 @@ namespace SeqCli.Config; -public class SeqCliForwarderDiagnosticConfig +public class ForwarderDiagnosticConfig { public string InternalLogPath { get; set; } = GetDefaultInternalLogPath(); public LogEventLevel InternalLoggingLevel { get; set; } = LogEventLevel.Information; From 5d7d9cb3a07482bea4e06e3029b9499c1b6fcf2e Mon Sep 17 00:00:00 2001 From: Liam McLennan Date: Thu, 29 Feb 2024 14:18:04 +1000 Subject: [PATCH 4/5] Moved forwarder configs to directory --- src/SeqCli/Config/{ => Forwarder}/ForwarderApiConfig.cs | 0 src/SeqCli/Config/{ => Forwarder}/ForwarderConfig.cs | 0 .../ForwarderDiagnosticConfig.cs} | 0 src/SeqCli/Config/{ => Forwarder}/ForwarderStorageConfig.cs | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename src/SeqCli/Config/{ => Forwarder}/ForwarderApiConfig.cs (100%) rename src/SeqCli/Config/{ => Forwarder}/ForwarderConfig.cs (100%) rename src/SeqCli/Config/{SeqCliDiagnosticConfig.cs => Forwarder/ForwarderDiagnosticConfig.cs} (100%) rename src/SeqCli/Config/{ => Forwarder}/ForwarderStorageConfig.cs (100%) diff --git a/src/SeqCli/Config/ForwarderApiConfig.cs b/src/SeqCli/Config/Forwarder/ForwarderApiConfig.cs similarity index 100% rename from src/SeqCli/Config/ForwarderApiConfig.cs rename to src/SeqCli/Config/Forwarder/ForwarderApiConfig.cs diff --git a/src/SeqCli/Config/ForwarderConfig.cs b/src/SeqCli/Config/Forwarder/ForwarderConfig.cs similarity index 100% rename from src/SeqCli/Config/ForwarderConfig.cs rename to src/SeqCli/Config/Forwarder/ForwarderConfig.cs diff --git a/src/SeqCli/Config/SeqCliDiagnosticConfig.cs b/src/SeqCli/Config/Forwarder/ForwarderDiagnosticConfig.cs similarity index 100% rename from src/SeqCli/Config/SeqCliDiagnosticConfig.cs rename to src/SeqCli/Config/Forwarder/ForwarderDiagnosticConfig.cs diff --git a/src/SeqCli/Config/ForwarderStorageConfig.cs b/src/SeqCli/Config/Forwarder/ForwarderStorageConfig.cs similarity index 100% rename from src/SeqCli/Config/ForwarderStorageConfig.cs rename to src/SeqCli/Config/Forwarder/ForwarderStorageConfig.cs From 561a5b1c503e277e7d3ec605fdcff7219066107a Mon Sep 17 00:00:00 2001 From: Liam McLennan Date: Thu, 29 Feb 2024 14:19:41 +1000 Subject: [PATCH 5/5] Cleanup project file --- src/SeqCli/SeqCli.csproj | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/SeqCli/SeqCli.csproj b/src/SeqCli/SeqCli.csproj index 03ea7a9c..54e9377f 100644 --- a/src/SeqCli/SeqCli.csproj +++ b/src/SeqCli/SeqCli.csproj @@ -60,18 +60,4 @@ - - - - - - - - - - - - - -