Send MAINPID to systemd when reexecing for logfile output

This allows the new process to notify systemd when it is ready. Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

Send MAINPID to systemd when reexecing for logfile output
5d1a37ee · Brad Davidson · Brad Davidson · a16105b3 · 5d1a37ee
Commit 5d1a37ee authored Sep 29, 2021 by Brad Davidson Committed by Brad Davidson Sep 29, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

log.go pkg/cli/cmds/log.go +6 -1

No files found.
--- a/pkg/cli/cmds/log.go
+++ b/pkg/cli/cmds/log.go
@@ -9,6 +9,7 @@ import (
 	"sync"
 	"time"

+	systemd "github.com/coreos/go-systemd/daemon"
 	"github.com/docker/docker/pkg/reexec"
 	"github.com/natefinch/lumberjack"
 	"github.com/rancher/k3s/pkg/version"
@@ -98,7 +99,11 @@ func runWithLogging() error {
 	cmd.Stderr = l
 	cmd.Stdout = l
 	cmd.Stdin = os.Stdin
-	return cmd.Run()
+	if err := cmd.Start(); err != nil {
+		return err
+	}
+	systemd.SdNotify(false, fmt.Sprintf("MAINPID=%d\n", cmd.Process.Pid))
+	return cmd.Wait()
 }

 func setupLogging() {