Skip to content

Commit d274c9e

Browse files
committed
Refactor logging in supervisor monitor to use stdout and stderr instead of log file
1 parent 91557a4 commit d274c9e

File tree

1 file changed

+2
-19
lines changed

1 file changed

+2
-19
lines changed

internal/guest/vminit/supervisor/monitor.go

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -141,29 +141,15 @@ func (m *Monitor) start(ctx context.Context) error {
141141
return fmt.Errorf("chmod supervisor binary: %w", err)
142142
}
143143

144-
// Create log directory
145-
logDir := "/var/log"
146-
if err := os.MkdirAll(logDir, 0755); err != nil {
147-
log.G(ctx).WithError(err).Warn("failed to create log directory")
148-
}
149-
150-
// Open log file
151-
logFile, err := os.OpenFile(LogFile, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644) //nolint:gosec
152-
if err != nil {
153-
log.G(ctx).WithError(err).Warn("failed to open supervisor log file, using /dev/null")
154-
logFile, _ = os.Open("/dev/null")
155-
}
156-
157144
cmd := exec.Command(m.binaryPath) //nolint:gosec
158-
cmd.Stdout = logFile
159-
cmd.Stderr = logFile
145+
cmd.Stdout = os.Stdout
146+
cmd.Stderr = os.Stderr
160147
cmd.Env = os.Environ()
161148
cmd.SysProcAttr = &syscall.SysProcAttr{
162149
Setsid: true, // Create new session
163150
}
164151

165152
if err := cmd.Start(); err != nil {
166-
logFile.Close()
167153
return fmt.Errorf("start supervisor: %w", err)
168154
}
169155

@@ -178,9 +164,6 @@ func (m *Monitor) start(ctx context.Context) error {
178164
log.G(ctx).WithError(err).Warn("failed to write supervisor PID file")
179165
}
180166

181-
// Close our handle to log file (process keeps its own)
182-
logFile.Close()
183-
184167
return nil
185168
}
186169

0 commit comments

Comments
 (0)