IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-11 20:45:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

resolving merge conflicts

Browse Source
This commit is contained in:
withchao
2025-03-07 14:48:44 +08:00
parent 1e54235263
commit aeee3f33b1
30 changed files with 503 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/common/startrpc/start.go
+2 -1
View File
@@ -70,7 +70,7 @@ func Start[T any](ctx context.Context, discovery *conf.Discovery, prometheusConf
return err
}
runTimeEnv := runtimeenv.PrintRuntimeEnvironment()
runTimeEnv := runtimeenv.RuntimeEnvironment()
if !autoSetPorts {
rpcPort, err := datautil.GetElemByIndex(rpcPorts, index)
@@ -177,6 +177,7 @@ func Start[T any](ctx context.Context, discovery *conf.Discovery, prometheusConf
}
err = client.Register(
ctx,
rpcRegisterName,
registerIP,
port,