|
|
@ -75,12 +75,14 @@ func run(port int, proPort int) error {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if err = client.RegisterConf2Registry(constant.OpenIMCommonConfigKey, config.Config.EncodeConfig()); err != nil {
|
|
|
|
if err = client.RegisterConf2Registry(constant.OpenIMCommonConfigKey, config.Config.EncodeConfig()); err != nil {
|
|
|
|
return err
|
|
|
|
return errs.Wrap(err, "register config to registry error")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var (
|
|
|
|
var (
|
|
|
|
netDone = make(chan struct{}, 1)
|
|
|
|
netDone = make(chan struct{}, 1)
|
|
|
|
netErr error
|
|
|
|
netErr error
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
router := api.NewGinRouter(client, rdb)
|
|
|
|
router := api.NewGinRouter(client, rdb)
|
|
|
|
if config.Config.Prometheus.Enable {
|
|
|
|
if config.Config.Prometheus.Enable {
|
|
|
|
go func() {
|
|
|
|
go func() {
|
|
|
@ -91,7 +93,6 @@ func run(port int, proPort int) error {
|
|
|
|
netDone <- struct{}{}
|
|
|
|
netDone <- struct{}{}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
}()
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var address string
|
|
|
|
var address string
|
|
|
@ -108,7 +109,6 @@ func run(port int, proPort int) error {
|
|
|
|
if err != nil && err != http.ErrServerClosed {
|
|
|
|
if err != nil && err != http.ErrServerClosed {
|
|
|
|
netErr = errs.Wrap(err, fmt.Sprintf("api start err: %s", server.Addr))
|
|
|
|
netErr = errs.Wrap(err, fmt.Sprintf("api start err: %s", server.Addr))
|
|
|
|
netDone <- struct{}{}
|
|
|
|
netDone <- struct{}{}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
}()
|
|
|
|
|
|
|
|
|
|
|
|