blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-10-26 13:12:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: config

Browse Source
This commit is contained in:
icey-yu 2024-12-25 16:59:07 +08:00
parent ccdd6d56fc
commit d8c15b2ab6
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/api/init.go
View File

@ -139,7 +139,6 @@ func Start(ctx context.Context, index int, config *Config) error {
if err != nil && !errors.Is(err, http.ErrServerClosed) { if err != nil && !errors.Is(err, http.ErrServerClosed) {
netErr = errs.WrapMsg(err, fmt.Sprintf("api start err: %s", server.Addr)) netErr = errs.WrapMsg(err, fmt.Sprintf("api start err: %s", server.Addr))
netDone <- struct{}{} netDone <- struct{}{}
} }
}() }()

4
internal/msggateway/ws_server.go
View File

@ -185,9 +185,9 @@ func (ws *WsServer) Run(done chan error) error {
go func() { go func() {
http.HandleFunc("/", ws.wsHandler) http.HandleFunc("/", ws.wsHandler)
err := server.ListenAndServe() err := server.ListenAndServe()
defer close(netDone)
if err != nil && !errors.Is(err, http.ErrServerClosed) { if err != nil && !errors.Is(err, http.ErrServerClosed) {
netErr = errs.WrapMsg(err, "ws start err", server.Addr) netErr = errs.WrapMsg(err, "ws start err", server.Addr)
netDone <- struct{}{}
} }
}() }()
ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
@ -204,7 +204,6 @@ func (ws *WsServer) Run(done chan error) error {
var err error var err error
select { select {
case err = <-done: case err = <-done:
fmt.Println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")
if err := shutDown(); err != nil { if err := shutDown(); err != nil {
return err return err
} }
@ -212,7 +211,6 @@ func (ws *WsServer) Run(done chan error) error {
return err return err
} }
case <-netDone: case <-netDone:
fmt.Println("BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB")
} }
return netErr return netErr