blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-12-03 02:42:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: del get env in minio conneted

Browse Source
This commit is contained in:
luhaoling 2024-01-31 09:59:10 +08:00
parent 8d4e035226
commit 78a5e0b1cd
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/rpcclient/third.go
View File

@ -18,10 +18,8 @@ import (
"context" "context"
"github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/credentials"
"net/url"
"os"
"google.golang.org/grpc" "google.golang.org/grpc"
"net/url"
"github.com/OpenIMSDK/protocol/third" "github.com/OpenIMSDK/protocol/third"
"github.com/OpenIMSDK/tools/discoveryregistry" "github.com/OpenIMSDK/tools/discoveryregistry"
@ -49,7 +47,7 @@ func NewThird(discov discoveryregistry.SvcDiscoveryRegistry) *Third {
func minioInit() (*minio.Client, error) { func minioInit() (*minio.Client, error) {
minioClient := &minio.Client{} minioClient := &minio.Client{}
var initUrl string var initUrl string
initUrl = getMinioAddr("MINIO_ENDPOINT", "MINIO_ADDRESS", "MINIO_PORT", config.Config.Object.Minio.Endpoint) initUrl = config.Config.Object.Minio.Endpoint
minioUrl, err := url.Parse(initUrl) minioUrl, err := url.Parse(initUrl)
if err != nil { if err != nil {
return nil, err return nil, err
@ -69,17 +67,3 @@ func minioInit() (*minio.Client, error) {
} }
return minioClient, nil return minioClient, nil
} }
func getMinioAddr(key1, key2, key3, fallback string) string {
// Prioritize environment variables
endpoint, endpointExist := os.LookupEnv(key1)
if !endpointExist {
endpoint = fallback
}
address, addressExist := os.LookupEnv(key2)
port, portExist := os.LookupEnv(key3)
if portExist && addressExist {
endpoint = "http://" + address + ":" + port
}
return endpoint
}