From 8ff31f32a525ed32273a65e6d28b88e24e9cf06e Mon Sep 17 00:00:00 2001
From: Anton Averchenkov <84287187+averche@users.noreply.github.com>
Date: Wed, 31 May 2023 12:22:16 -0400
Subject: [PATCH] agent: Don't print errors on exit 0 in supervisor mode
 (#20880)

---
 command/agent.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/command/agent.go b/command/agent.go
index e04d14bfe0..d3737be9af 100644
--- a/command/agent.go
+++ b/command/agent.go
@@ -838,16 +838,21 @@ func (c *AgentCommand) Run(args []string) int {
 
 	var exitCode int
 	if err := g.Run(); err != nil {
-		c.logger.Error("runtime error encountered", "error", err)
-		c.UI.Error("Error encountered during run, refer to logs for more details.")
 		var processExitError *exec.ProcessExitError
 		if errors.As(err, &processExitError) {
 			exitCode = processExitError.ExitCode
 		} else {
 			exitCode = 1
 		}
+
+		if exitCode != 0 {
+			c.logger.Error("runtime error encountered", "error", err, "exitCode", exitCode)
+			c.UI.Error("Error encountered during run, refer to logs for more details.")
+		}
 	}
+
 	c.notifySystemd(systemd.SdNotifyStopping)
+
 	return exitCode
 }