|
|
@ -190,9 +190,8 @@ func (ws *WsServer) Run(done chan error) error {
|
|
|
|
netErr = errs.WrapMsg(err, "ws start err", server.Addr)
|
|
|
|
netErr = errs.WrapMsg(err, "ws start err", server.Addr)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
}()
|
|
|
|
shutDown := func() error {
|
|
|
|
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
|
|
|
|
defer cancel()
|
|
|
|
shutDown := func() error {
|
|
|
|
sErr := server.Shutdown(ctx)
|
|
|
|
sErr := server.Shutdown(ctx)
|
|
|
|
if sErr != nil {
|
|
|
|
if sErr != nil {
|
|
|
|
return errs.WrapMsg(sErr, "shutdown err")
|
|
|
|
return errs.WrapMsg(sErr, "shutdown err")
|
|
|
@ -200,8 +199,8 @@ func (ws *WsServer) Run(done chan error) error {
|
|
|
|
close(shutdownDone)
|
|
|
|
close(shutdownDone)
|
|
|
|
return nil
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
log.ZError(context.Background(), "NJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ", nil)
|
|
|
|
|
|
|
|
etcd.RegisterShutDown(shutDown)
|
|
|
|
etcd.RegisterShutDown(shutDown)
|
|
|
|
|
|
|
|
defer cancel()
|
|
|
|
var err error
|
|
|
|
var err error
|
|
|
|
select {
|
|
|
|
select {
|
|
|
|
case err = <-done:
|
|
|
|
case err = <-done:
|
|
|
|