Skip to content

Ensure proxy logs are available in the UI log stream. #8

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
D3-LucaPiombino merged 1 commit into from
Mar 30, 2025
Merged

Ensure proxy logs are available in the UI log stream. #8

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
10 changes: 9 additions & 1 deletion container-desktop/ContainerDesktop/Services/DefaultContainerEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ private void StartProxy()
.Add("--tls-cert", Path.Combine(LocalCertsPath, "cert.pem"), true)
.Add("--tls-ca", Path.Combine(LocalCertsPath, "ca.pem"), true)
.Build();
_proxyProcess = _processExecutor.Start(proxyPath, args);
_proxyProcess = _processExecutor.Start(proxyPath, args, stdOut: LogStdOut, stdErr: LogStdError);
// Give it some time to startup
if (_proxyProcess.WaitForExit(1000))
{
Expand Down Expand Up @@ -569,6 +569,14 @@ private void OnConfigurationChanged(object sender, ConfigurationChangedEventArgs
_ = Task.Run(() => UpdateCertificates());
}
}
private void LogStdOut(string s)
{
_logger.LogInformation(s);
}
private void LogStdError(string s)
{
_logger.LogInformation(s);
}
}

#pragma warning restore CA2254
8 changes: 4 additions & 4 deletions internal/rewrite/rewrite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ func mapPath(binding string, context *rewriteContext) string {
} else if strings.HasPrefix(s, "/") {
s = path + s
}
logger.Warnf("%s ==> %-40s", lctx, s)
logger.Infof("%s ==> %-40s", lctx, s)
return s
}

Expand All @@ -316,7 +316,7 @@ func mapPathV2(binding string, context *rewriteContext) string {
// (e.g. //var/run/docker.sock)
if strings.HasPrefix(binding, "//") {
// Log the mapping result
logger.Warnf("%s ==> %-40s", lctx, binding)
logger.Infof("%s ==> %-40s", lctx, binding)
return binding
}

Expand Down Expand Up @@ -391,7 +391,7 @@ func mapPathV2(binding string, context *rewriteContext) string {
if context.rewriteType == Request {
parts[0] = getHostMountPath(allPathSegments...)
} else {
logger.Warnf("%s Don't know how to map mount type %s (type: %s) for response ", lctx, parts[0], mntType)
logger.Infof("%s Don't know how to map mount type %s (type: %s) for response ", lctx, parts[0], mntType)
}
}
s = strings.Join(parts, ":")
Expand Down Expand Up @@ -442,7 +442,7 @@ func mapPathV2(binding string, context *rewriteContext) string {
}

// Log the mapping result
logger.Warnf("%s ==> %-40s", lctx, s)
logger.Infof("%s ==> %-40s", lctx, s)

return s
}
Expand Down