blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-09-10 11:28:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 48a2e27d40590309d075d8778ec2aea3e366954f into de0f1eec8a2dd4808dccff01d68685b13006686d

Browse Source
This commit is contained in:
dsx137 2026-07-21 05:50:35 +00:00 committed by GitHub
commit 5d988cc60e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 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
.idea
dist/
dist/
.omo
.sisyphus

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

@ -21,7 +21,7 @@ import (
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
"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/discovery/kubernetes"
@ -33,17 +33,24 @@ import (
// 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) {
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:
return kubernetes.NewConnManager(discovery.Kubernetes.Namespace, watchNames,
grpc.WithDefaultCallOptions(
grpc.MaxCallSendMsgSize(1024*1024*20),
),
)
}
switch discovery.Enable {
case config.ETCD:
return etcd.NewSvcDiscoveryRegistry(
discovery.Etcd.RootDirectory,
@ -53,6 +60,6 @@ func NewDiscoveryRegister(discovery *config.Discovery, watchNames []string) (dis
etcd.WithMaxCallSendMsgSize(20*1024*1024),
etcd.WithUsernameAndPassword(discovery.Etcd.Username, discovery.Etcd.Password))
default:
return nil, errs.New("unsupported discovery type", "type", discovery.Enable).Wrap()
return nil, errs.New("unsupported discovery type", "type", discoveryType).Wrap()
}
}