Skip to content

Add proxy eventhub logger back #573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yangpanMS merged 1 commit into from
Aug 25, 2025
Merged

Add proxy eventhub logger back #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.18
2.1.19
20 changes: 16 additions & 4 deletions src/VirtualClient/VirtualClient.Main/CommandBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,10 @@ protected virtual IEnumerable<string> GetLoggerDefinitions()
if (loggerDefinitions.Any( l => Regex.IsMatch(l, "^file", RegexOptions.IgnoreCase)))
{
// only add proxy logger if user also asked for file logging.
loggerDefinitions.Add($"proxy;file;{this.ProxyApiUri.ToString()}");
}
else
{
loggerDefinitions.Add($"proxy;{this.ProxyApiUri.ToString()}");
}

Expand Down Expand Up @@ -684,7 +688,8 @@ protected virtual IList<ILoggerProvider> InitializeLoggerProviders(IConfiguratio
break;

case "proxy":
CommandBase.AddProxyApiLogging(loggingProviders, configuration, platformSpecifics, new Uri(loggerParameters), this.CertificateManager, source);

CommandBase.AddProxyApiLogging(loggingProviders, configuration, platformSpecifics, loggerParameters, this.CertificateManager, source);
break;

case "summary":
Expand Down Expand Up @@ -805,14 +810,21 @@ private static void AddFileLogging(List<ILoggerProvider> loggingProviders, IConf
}
}

private static void AddProxyApiLogging(List<ILoggerProvider> loggingProviders, IConfiguration configuration, PlatformSpecifics specifics, Uri proxyApiUri, ICertificateManager certificateManager, string source = null)
private static void AddProxyApiLogging(List<ILoggerProvider> loggingProviders, IConfiguration configuration, PlatformSpecifics specifics, string parameters, ICertificateManager certificateManager, string source = null)
{
if (proxyApiUri != null)
ILogger debugLogger = null;
if (parameters.StartsWith("file;", StringComparison.OrdinalIgnoreCase))
{
ILogger debugLogger = DependencyFactory.CreateFileLoggerProvider(specifics.GetLogsPath("proxy-traces.log"), TimeSpan.FromSeconds(5), LogLevel.Trace)
debugLogger = DependencyFactory.CreateFileLoggerProvider(specifics.GetLogsPath("proxy-traces.log"), TimeSpan.FromSeconds(5), LogLevel.Trace)
.CreateLogger("Proxy");

CommandBase.proxyApiDebugLoggers.Add(debugLogger);
parameters = parameters.Substring("file;".Length);
}

if (!string.IsNullOrEmpty(parameters))
{
Uri proxyApiUri = new Uri(parameters);

X509Certificate2 certificate = null;
if (EndpointUtility.TryParseCertificateReference(proxyApiUri, out string issuer, out string subject))
Expand Down
Loading