Skip to content

[supervisor] init: Add logging around termination #20380

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
merged 1 commit into from
Nov 21, 2024
Merged

[supervisor] init: Add logging around termination #20380

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: 8 additions & 2 deletions components/supervisor/cmd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ var initCmd = &cobra.Command{
select {
case <-supervisorDone:
// supervisor has ended - we're all done here
defer log.Info("supervisor has ended (supervisorDone)")
return
case <-sigInput:
ignoreUnexpectedExitCode.Store(true)
Expand All @@ -160,8 +161,10 @@ var initCmd = &cobra.Command{
select {
case <-ctx.Done():
// Time is up, but we give all the goroutines a bit more time to react to this.
time.Sleep(time.Millisecond * 500)
time.Sleep(time.Millisecond * 1000)
defer log.Info("supervisor has ended (ctx.Done)")
case <-terminationDone:
defer log.Info("supervisor has ended (terminationDone)")
}
slog.write("Finished shutting down all processes.")
}
Expand Down Expand Up @@ -229,10 +232,12 @@ type shutdownLoggerImpl struct {

func (l *shutdownLoggerImpl) write(s string) {
if l.file != nil {
_, err := l.file.WriteString(fmt.Sprintf("[%s] %s \n", time.Since(l.startTime), s))
msg := fmt.Sprintf("[%s] %s \n", time.Since(l.startTime), s)
_, err := l.file.WriteString(msg)
if err != nil {
log.WithError(err).Error("couldn't write to log file")
}
log.Infof("slog: %s", msg)
} else {
log.Debug(s)
}
Expand All @@ -250,6 +255,7 @@ func (l *shutdownLoggerImpl) TerminateSync(ctx context.Context, pid int) {
if err != nil {
l.write(fmt.Sprintf("Couldn't obtain process information for PID %d.", pid))
} else if stat.State == "Z" {
l.write(fmt.Sprintf("Process %s with PID %d is a zombie, skipping termination.", stat.Comm, pid))
return
} else {
l.write(fmt.Sprintf("Terminating process %s with PID %d (state: %s, cmdlind: %s).", stat.Comm, pid, stat.State, fmt.Sprint(proc.CmdLine())))
Expand Down
Loading