fix conflict

Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
This commit is contained in:
‘hanzhixiao’ 2023-07-13 11:32:00 +08:00
parent 0cb592be1f
commit 497bf941bb

View File

@ -42,7 +42,6 @@ func startPprof() {
}
func run(port int) error {
port = 10002
if port == 0 {
return fmt.Errorf("port is empty")
}
@ -58,7 +57,7 @@ func run(port int) error {
if err != nil {
return err
}
if err := client.CreateRpcRootNodes(config.GetServiceNames()); err != nil {
if client.CreateRpcRootNodes(config.GetServiceNames()); err != nil {
return err
}
fmt.Println("api init discov client success")