fix: config

icey-yu · Dec 25, 2024 · 54c6397 · 54c6397
1 parent b783da2
commit 54c6397
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/internal/msggateway/ws_server.go b/internal/msggateway/ws_server.go
@@ -197,7 +197,6 @@ func (ws *WsServer) Run(done chan error) error {
 			return errs.WrapMsg(sErr, "shutdown err")
 		}
 		close(shutdownDone)
-		fmt.Println("SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS")
 		return nil
 	}
 	etcd.RegisterShutDown(shutDown)

diff --git a/pkg/common/discovery/etcd/config_manager.go b/pkg/common/discovery/etcd/config_manager.go
@@ -2,7 +2,6 @@ package etcd
 
 import (
 	"context"
-	"fmt"
 	"os"
 	"os/exec"
 	"runtime"
@@ -95,12 +94,10 @@ func restartServer(ctx context.Context) error {
 	}
 	log.ZInfo(ctx, "shutdown server")
 	for _, f := range ShutDowns {
-		log.ZInfo(ctx, "shutdown ffff")
 		if err = f(); err != nil {
 			log.ZError(ctx, "shutdown fail", err)
 		}
 	}
-	fmt.Println("HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH")
 
 	log.ZInfo(ctx, "restart server")
 	err = cmd.Start()

diff --git a/pkg/common/startrpc/start.go b/pkg/common/startrpc/start.go
@@ -188,7 +188,7 @@ func Start[T any](ctx context.Context, discovery *conf.Discovery, prometheusConf
 
 	go func() {
 		err := srv.Serve(listener)
-		if err != nil {
+		if err != nil && !errors.Is(err, http.ErrServerClosed) {
 			netErr = errs.WrapMsg(err, "rpc start err: ", rpcTcpAddr)
 			netDone <- struct{}{}
 		}