blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-07-23 15:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(core): select discovery backend from configured type (#3773)

Browse Source 
* refactor(core): select discovery backend from configured type

* refactor(core): select discovery backend from configured type

* refactor(core): select discovery backend from configured type

* refactor(core): select discovery backend from configured type
This commit is contained in:
dsx137 2026-07-22 15:46:44 +08:00 committed by GitHub
parent de0f1eec8a
commit 2f7561bf49
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -387,4 +387,7 @@ Sessionx.vim
# End of https://www.toptal.com/developers/gitignore/api/go,git,vim,tags,test,emacs,backup,jetbrains # End of https://www.toptal.com/developers/gitignore/api/go,git,vim,tags,test,emacs,backup,jetbrains
.idea .idea
dist/ dist/
.omo
.sisyphus

28
pkg/common/discovery/discoveryregister.go
View File

@ -15,13 +15,14 @@
package discovery package discovery
import ( import (
"strings"
"time" "time"
"google.golang.org/grpc" "google.golang.org/grpc"
"github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/discovery"
"github.com/openimsdk/tools/discovery/inprocess" "github.com/openimsdk/tools/discovery/standalone"
"github.com/openimsdk/tools/utils/runtimeenv" "github.com/openimsdk/tools/utils/runtimeenv"
"github.com/openimsdk/tools/discovery/kubernetes" "github.com/openimsdk/tools/discovery/kubernetes"
@ -33,17 +34,28 @@ import (
// NewDiscoveryRegister creates a new service discovery and registry client based on the provided environment type. // NewDiscoveryRegister creates a new service discovery and registry client based on the provided environment type.
func NewDiscoveryRegister(discovery *config.Discovery, watchNames []string) (discovery.SvcDiscoveryRegistry, error) { func NewDiscoveryRegister(discovery *config.Discovery, watchNames []string) (discovery.SvcDiscoveryRegistry, error) {
if config.Standalone() { if config.Standalone() {
return inprocess.GetSvcDiscoveryRegistry(), nil return standalone.GetSvcDiscoveryRegistry(), nil
} }
if runtimeenv.RuntimeEnvironment() == config.KUBERNETES {
return kubernetes.NewConnManager(discovery.Kubernetes.Namespace, nil, runtimeEnvironment := runtimeenv.RuntimeEnvironment()
discoveryType := discovery.Enable
if discoveryType == "" && runtimeEnvironment == config.KUBERNETES {
discoveryType = config.KUBERNETES
}
if discoveryType == config.KUBERNETES && runtimeEnvironment != config.KUBERNETES {
return nil, errs.New("unsupported discovery type", "type", discoveryType).Wrap()
}
switch discoveryType {
case config.KUBERNETES:
for i := range watchNames {
watchNames[i] = strings.Split(watchNames[i], ":")[0]
}
return kubernetes.NewConnManager(discovery.Kubernetes.Namespace, watchNames,
grpc.WithDefaultCallOptions( grpc.WithDefaultCallOptions(
grpc.MaxCallSendMsgSize(1024*1024*20), grpc.MaxCallSendMsgSize(1024*1024*20),
), ),
grpc.WithDefaultServiceConfig(`{"loadBalancingPolicy":"round_robin"}`),
) )
}
switch discovery.Enable {
case config.ETCD: case config.ETCD:
return etcd.NewSvcDiscoveryRegistry( return etcd.NewSvcDiscoveryRegistry(
discovery.Etcd.RootDirectory, discovery.Etcd.RootDirectory,
@ -53,6 +65,6 @@ func NewDiscoveryRegister(discovery *config.Discovery, watchNames []string) (dis
etcd.WithMaxCallSendMsgSize(20*1024*1024), etcd.WithMaxCallSendMsgSize(20*1024*1024),
etcd.WithUsernameAndPassword(discovery.Etcd.Username, discovery.Etcd.Password)) etcd.WithUsernameAndPassword(discovery.Etcd.Username, discovery.Etcd.Password))
default: default:
return nil, errs.New("unsupported discovery type", "type", discovery.Enable).Wrap() return nil, errs.New("unsupported discovery type", "type", discoveryType).Wrap()
} }
} }