From 388f6b1093871e775b0cdf9373ae98b96dd9f6e7 Mon Sep 17 00:00:00 2001
From: Ben McClelland <ben.mcclelland@versity.com>
Date: Mon, 18 Mar 2024 15:39:56 -0700
Subject: [PATCH] fix: return success exit status if shutdown succeeds

Fixes #465
---
 cmd/versitygw/main.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/cmd/versitygw/main.go b/cmd/versitygw/main.go
index 19b298c7..0b448c94 100644
--- a/cmd/versitygw/main.go
+++ b/cmd/versitygw/main.go
@@ -492,7 +492,6 @@ Loop:
 	for {
 		select {
 		case <-ctx.Done():
-			err = ctx.Err()
 			break Loop
 		case err = <-c:
 			break Loop
@@ -512,12 +511,18 @@ Loop:
 
 	err = iam.Shutdown()
 	if err != nil {
+		if saveErr == nil {
+			saveErr = err
+		}
 		fmt.Fprintf(os.Stderr, "shutdown iam: %v\n", err)
 	}
 
 	if logger != nil {
 		err := logger.Shutdown()
 		if err != nil {
+			if saveErr == nil {
+				saveErr = err
+			}
 			fmt.Fprintf(os.Stderr, "shutdown logger: %v\n", err)
 		}
 	}