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

fix: config

Browse Source
This commit is contained in:
icey-yu 2024-12-25 16:37:59 +08:00
parent b783da2497
commit 54c6397b30
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/msggateway/ws_server.go
View File

@ -197,7 +197,6 @@ func (ws *WsServer) Run(done chan error) error {
return errs.WrapMsg(sErr, "shutdown err") return errs.WrapMsg(sErr, "shutdown err")
} }
close(shutdownDone) close(shutdownDone)
fmt.Println("SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS")
return nil return nil
} }
etcd.RegisterShutDown(shutDown) etcd.RegisterShutDown(shutDown)

3
pkg/common/discovery/etcd/config_manager.go
View File

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

2
pkg/common/startrpc/start.go
View File

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