From f4f742c2bd76487551ea14e8b1f5ea6d06a53730 Mon Sep 17 00:00:00 2001
From: lng2020 <nanguanlin6@gmail.com>
Date: Mon, 18 Mar 2024 00:52:35 +0800
Subject: [PATCH 1/2] Remove unused error in graceful manager

---
 modules/graceful/manager_unix.go |  4 ++--
 modules/graceful/net_unix.go     | 10 +---------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/modules/graceful/manager_unix.go b/modules/graceful/manager_unix.go
index f49c42650ccb0..41b8c0d36b91d 100644
--- a/modules/graceful/manager_unix.go
+++ b/modules/graceful/manager_unix.go
@@ -59,8 +59,8 @@ func (g *Manager) start() {
 	go func() {
 		defer func() {
 			close(startupDone)
-			// Close the unused listeners and ignore the error here there's not much we can do with it, they're logged in the CloseProvidedListeners function
-			_ = CloseProvidedListeners()
+			// Close the unused listeners
+			CloseProvidedListeners()
 		}()
 		// Wait for all servers to be created
 		g.createServerCond.L.Lock()
diff --git a/modules/graceful/net_unix.go b/modules/graceful/net_unix.go
index 4f8c036a69611..6f72f1073f784 100644
--- a/modules/graceful/net_unix.go
+++ b/modules/graceful/net_unix.go
@@ -130,24 +130,16 @@ func getProvidedFDs() (savedErr error) {
 }
 
 // CloseProvidedListeners closes all unused provided listeners.
-func CloseProvidedListeners() error {
+func CloseProvidedListeners() {
 	mutex.Lock()
 	defer mutex.Unlock()
-	var returnableError error
 	for _, l := range providedListeners {
 		err := l.Close()
 		if err != nil {
 			log.Error("Error in closing unused provided listener: %v", err)
-			if returnableError != nil {
-				returnableError = fmt.Errorf("%v & %w", returnableError, err)
-			} else {
-				returnableError = err
-			}
 		}
 	}
 	providedListeners = []net.Listener{}
-
-	return returnableError
 }
 
 // DefaultGetListener obtains a listener for the stream-oriented local network address:

From 783decc30e9bd4fae6fec4016cc0c5f7c6c01bf6 Mon Sep 17 00:00:00 2001
From: lng2020 <nanguanlin6@gmail.com>
Date: Mon, 18 Mar 2024 15:25:28 +0800
Subject: [PATCH 2/2] convert case

---
 modules/graceful/manager_unix.go | 2 +-
 modules/graceful/net_unix.go     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/graceful/manager_unix.go b/modules/graceful/manager_unix.go
index 41b8c0d36b91d..d03fff9b5bba8 100644
--- a/modules/graceful/manager_unix.go
+++ b/modules/graceful/manager_unix.go
@@ -60,7 +60,7 @@ func (g *Manager) start() {
 		defer func() {
 			close(startupDone)
 			// Close the unused listeners
-			CloseProvidedListeners()
+			closeProvidedListeners()
 		}()
 		// Wait for all servers to be created
 		g.createServerCond.L.Lock()
diff --git a/modules/graceful/net_unix.go b/modules/graceful/net_unix.go
index 6f72f1073f784..796e00507cce2 100644
--- a/modules/graceful/net_unix.go
+++ b/modules/graceful/net_unix.go
@@ -129,8 +129,8 @@ func getProvidedFDs() (savedErr error) {
 	return savedErr
 }
 
-// CloseProvidedListeners closes all unused provided listeners.
-func CloseProvidedListeners() {
+// closeProvidedListeners closes all unused provided listeners.
+func closeProvidedListeners() {
 	mutex.Lock()
 	defer mutex.Unlock()
 	for _, l := range providedListeners {