From 20f6307dcaa1e8f3dffbaef8fd0c9703bb280561 Mon Sep 17 00:00:00 2001
From: tuzhiwei <tuzhiwei@iplusbot.com>
Date: Thu, 19 Jan 2023 21:40:36 +0800
Subject: [PATCH] server exit gracefully a bit

---
 tcp/server.go | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/tcp/server.go b/tcp/server.go
index 9a3d6cd..766f4db 100644
--- a/tcp/server.go
+++ b/tcp/server.go
@@ -7,14 +7,15 @@ package tcp
 import (
 	"context"
 	"fmt"
-	"github.com/hdt3213/godis/interface/tcp"
-	"github.com/hdt3213/godis/lib/logger"
 	"net"
 	"os"
 	"os/signal"
 	"sync"
 	"syscall"
 	"time"
+
+	"github.com/hdt3213/godis/interface/tcp"
+	"github.com/hdt3213/godis/lib/logger"
 )
 
 // Config stores tcp server properties
@@ -46,27 +47,30 @@ func ListenAndServeWithSignal(cfg *Config, handler tcp.Handler) error {
 	return nil
 }
 
+// ListenAndServe binds port and handle requests, blocking until close
 // ListenAndServe binds port and handle requests, blocking until close
 func ListenAndServe(listener net.Listener, handler tcp.Handler, closeChan <-chan struct{}) {
 	// listen signal
+	errCh := make(chan error)
+	defer close(errCh)
 	go func() {
-		<-closeChan
+		select {
+		case <-closeChan:
+			logger.Info("get exit signal")
+		case er := <-errCh:
+			logger.Info(fmt.Sprintf("accept error: %s", er.Error()))
+		}
 		logger.Info("shutting down...")
 		_ = listener.Close() // listener.Accept() will return err immediately
 		_ = handler.Close()  // close connections
 	}()
 
-	// listen port
-	defer func() {
-		// close during unexpected error
-		_ = listener.Close()
-		_ = handler.Close()
-	}()
 	ctx := context.Background()
 	var waitDone sync.WaitGroup
 	for {
 		conn, err := listener.Accept()
 		if err != nil {
+			errCh <- err
 			break
 		}
 		// handle