diff --git a/internal/api/init.go b/internal/api/init.go index 0a122b901..780ecb913 100644 --- a/internal/api/init.go +++ b/internal/api/init.go @@ -139,7 +139,6 @@ func Start(ctx context.Context, index int, config *Config) error { if err != nil && !errors.Is(err, http.ErrServerClosed) { netErr = errs.WrapMsg(err, fmt.Sprintf("api start err: %s", server.Addr)) netDone <- struct{}{} - } }() diff --git a/internal/msggateway/ws_server.go b/internal/msggateway/ws_server.go index 600a989df..24dd823f6 100644 --- a/internal/msggateway/ws_server.go +++ b/internal/msggateway/ws_server.go @@ -185,9 +185,9 @@ func (ws *WsServer) Run(done chan error) error { go func() { http.HandleFunc("/", ws.wsHandler) err := server.ListenAndServe() - defer close(netDone) if err != nil && !errors.Is(err, http.ErrServerClosed) { netErr = errs.WrapMsg(err, "ws start err", server.Addr) + netDone <- struct{}{} } }() ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second) @@ -204,7 +204,6 @@ func (ws *WsServer) Run(done chan error) error { var err error select { case err = <-done: - fmt.Println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA") if err := shutDown(); err != nil { return err } @@ -212,7 +211,6 @@ func (ws *WsServer) Run(done chan error) error { return err } case <-netDone: - fmt.Println("BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB") } return netErr