mirror of
https://github.com/openimsdk/open-im-server.git
synced 2026-01-11 15:32:25 +08:00
fix conflict
Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
This commit is contained in:
parent
0cb592be1f
commit
497bf941bb
@ -42,7 +42,6 @@ func startPprof() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func run(port int) error {
|
func run(port int) error {
|
||||||
port = 10002
|
|
||||||
if port == 0 {
|
if port == 0 {
|
||||||
return fmt.Errorf("port is empty")
|
return fmt.Errorf("port is empty")
|
||||||
}
|
}
|
||||||
@ -58,7 +57,7 @@ func run(port int) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := client.CreateRpcRootNodes(config.GetServiceNames()); err != nil {
|
if client.CreateRpcRootNodes(config.GetServiceNames()); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
fmt.Println("api init discov client success")
|
fmt.Println("api init discov client success")
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user