feat(portforward): log subcommands outputs with "up/down command:" prefix

This commit is contained in:
Quentin McGaw
2026-07-31 00:27:40 +00:00
parent b00279bc61
commit ab09534a84
3 changed files with 31 additions and 2 deletions
+21
View File
@@ -49,3 +49,24 @@ func portPairToString(internal, external uint16) string {
}
return fmt.Sprintf("%d (internal port %d)", external, internal)
}
type loggerWithPrefix struct {
prefix string
logger Logger
}
func (l *loggerWithPrefix) Debug(msg string) {
l.logger.Debug(l.prefix + msg)
}
func (l *loggerWithPrefix) Info(msg string) {
l.logger.Info(l.prefix + msg)
}
func (l *loggerWithPrefix) Warn(msg string) {
l.logger.Warn(l.prefix + msg)
}
func (l *loggerWithPrefix) Error(msg string) {
l.logger.Error(l.prefix + msg)
}
+5 -1
View File
@@ -133,7 +133,11 @@ func (s *Service) onNewPorts(ctx context.Context, internalToExternalPorts map[ui
copy(s.ports, externalPorts)
if s.settings.UpCommand != "" {
err = runCommand(ctx, s.cmder, s.logger, s.settings.UpCommand, externalPorts, s.settings.Interface)
logger := &loggerWithPrefix{
prefix: "up command: ",
logger: s.logger,
}
err = runCommand(ctx, s.cmder, logger, s.settings.UpCommand, externalPorts, s.settings.Interface)
if err != nil {
err = fmt.Errorf("running up command: %w", err)
s.logger.Error(err.Error())
+5 -1
View File
@@ -32,7 +32,11 @@ func (s *Service) cleanup() (err error) {
const downTimeout = 60 * time.Second
ctx, cancel := context.WithTimeout(context.Background(), downTimeout)
defer cancel()
err = runCommand(ctx, s.cmder, s.logger, s.settings.DownCommand, s.ports, s.settings.Interface)
logger := &loggerWithPrefix{
prefix: "down command: ",
logger: s.logger,
}
err = runCommand(ctx, s.cmder, logger, s.settings.DownCommand, s.ports, s.settings.Interface)
if err != nil {
err = fmt.Errorf("running down command: %w", err)
s.logger.Error(err.Error())