From e43e1d2426e1d6374d3ce787bacd80f6f675ae80 Mon Sep 17 00:00:00 2001 From: Yang Pan Date: Thu, 21 Aug 2025 12:43:59 -0700 Subject: [PATCH 1/2] Remove proxy logger from default --- VERSION | 2 +- src/VirtualClient/VirtualClient.Main/CommandBase.cs | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 2f1a5aa9c1..9d40fd662e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.17 +2.1.18 \ No newline at end of file diff --git a/src/VirtualClient/VirtualClient.Main/CommandBase.cs b/src/VirtualClient/VirtualClient.Main/CommandBase.cs index bcaccbf724..515e84c04c 100644 --- a/src/VirtualClient/VirtualClient.Main/CommandBase.cs +++ b/src/VirtualClient/VirtualClient.Main/CommandBase.cs @@ -454,7 +454,12 @@ protected virtual IEnumerable GetLoggerDefinitions() // e.g. (--logger=proxy;http://192.168.1.25:9812) if (!loggerDefinitions.Any(l => Regex.IsMatch(l, "^proxy;", RegexOptions.IgnoreCase)) && this.ProxyApiUri != null) { - loggerDefinitions.Add($"proxy;{this.ProxyApiUri.ToString()}"); + if (loggerDefinitions.Any( l => l.Equals("file", StringComparison.InvariantCultureIgnoreCase))) + { + // only add proxy logger if user also asked for file logging. + loggerDefinitions.Add($"proxy;{this.ProxyApiUri.ToString()}"); + } + } return loggerDefinitions; From 9f170f2c0d68dcf8910b3f7969446405467a6454 Mon Sep 17 00:00:00 2001 From: Yang Pan Date: Thu, 21 Aug 2025 12:46:48 -0700 Subject: [PATCH 2/2] change to regex --- src/VirtualClient/VirtualClient.Main/CommandBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/VirtualClient/VirtualClient.Main/CommandBase.cs b/src/VirtualClient/VirtualClient.Main/CommandBase.cs index 515e84c04c..01a2f140f0 100644 --- a/src/VirtualClient/VirtualClient.Main/CommandBase.cs +++ b/src/VirtualClient/VirtualClient.Main/CommandBase.cs @@ -454,7 +454,7 @@ protected virtual IEnumerable GetLoggerDefinitions() // e.g. (--logger=proxy;http://192.168.1.25:9812) if (!loggerDefinitions.Any(l => Regex.IsMatch(l, "^proxy;", RegexOptions.IgnoreCase)) && this.ProxyApiUri != null) { - if (loggerDefinitions.Any( l => l.Equals("file", StringComparison.InvariantCultureIgnoreCase))) + if (loggerDefinitions.Any( l => Regex.IsMatch(l, "^file", RegexOptions.IgnoreCase))) { // only add proxy logger if user also asked for file logging. loggerDefinitions.Add($"proxy;{this.ProxyApiUri.ToString()}");