Skip to content
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

Enable process debug logging #3134

Merged
merged 2 commits into from
Dec 18, 2024
Merged

Enable process debug logging #3134

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bdc5a6
Enable process debug logging
patrobinson Dec 17, 2024
7462d39
Merge branch 'main' into enable-process-debug-logging
patrobinson Dec 17, 2024
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
8 changes: 7 additions & 1 deletion internal/shell/shell.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,9 @@ func (s *Shell) executeCommand(ctx context.Context, cmdCfg process.Config, stdou
cmdCfg.Stderr = io.Discard
}

var processLogger logger.Logger
processLogger = logger.Discard

if s.debug {
// Display normally-hidden output streams using log streamer.
if cmdCfg.Stdout == io.Discard {
Expand All @@ -578,6 +581,9 @@ func (s *Shell) executeCommand(ctx context.Context, cmdCfg process.Config, stdou
defer stdErrStreamer.Close()
cmdCfg.Stderr = stdErrStreamer
}

// This should respect the log format we set for the agent
processLogger = logger.NewConsoleLogger(logger.NewTextPrinter(cmdCfg.Stderr), os.Exit)
}

if s.commandLog != nil {
Expand All @@ -590,7 +596,7 @@ func (s *Shell) executeCommand(ctx context.Context, cmdCfg process.Config, stdou
return nil
}

p := process.New(logger.Discard, cmdCfg)
p := process.New(processLogger, cmdCfg)
s.proc.Store(p)

if err := p.Run(ctx); err != nil {
Expand Down