msb-public
/
Open-IM-Server
mirror of https://github.com/OpenIMSDK/Open-IM-Server
2
0
Code Issues Projects Releases Wiki Activity

fix: add env in minio connected

Browse Source
pull/1846/head
luhaoling 2 years ago
parent 496c141f35
commit 922058b868
3 changed files with 89 additions and 51 deletions
Show Stats Download Patch File Download Diff File

18
pkg/common/db/s3/minio/minio.go
Unescape View File

@ -21,6 +21,7 @@ import (
"io"
"net/http"
"net/url"
"os"
"path"
"reflect"
"strconv"
@ -60,7 +61,8 @@ const (
const successCode = http.StatusOK
func NewMinio(cache cache.MinioCache) (s3.Interface, error) {
u, err := url.Parse(config.Config.Object.Minio.Endpoint)
initUrl := getMinioAddr("MINIO_ENDPOINT", "MINIO_ADDRESS", "MINIO_PORT", config.Config.Object.Minio.Endpoint)
u, err := url.Parse(initUrl)
if err != nil {
return nil, err
}
@ -491,3 +493,17 @@ func (m *Minio) FormData(ctx context.Context, name string, size int64, contentTy
SuccessCodes: []int{successCode},
}, 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
}

20
pkg/rpcclient/third.go
Unescape View File

@ -16,10 +16,10 @@ package rpcclient
import (
"context"
"net/url"
"github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials"
"net/url"
"os"
"google.golang.org/grpc"
@ -49,7 +49,7 @@ func NewThird(discov discoveryregistry.SvcDiscoveryRegistry) *Third {
func minioInit() (*minio.Client, error) {
minioClient := &minio.Client{}
var initUrl string
initUrl = config.Config.Object.Minio.Endpoint
initUrl = getMinioAddr("MINIO_ENDPOINT", "MINIO_ADDRESS", "MINIO_PORT", config.Config.Object.Minio.Endpoint)
minioUrl, err := url.Parse(initUrl)
if err != nil {
return nil, err
@ -69,3 +69,17 @@ func minioInit() (*minio.Client, error) {
}
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
}

96
tools/component/component.go
Unescape View File

@ -138,16 +138,9 @@ func checkMinio() (string, error) {
return "", nil
}
// Prioritize environment variables
endpoint := getEnv("MINIO_ENDPOINT", config.Config.Object.Minio.Endpoint)
address, addressExist := os.LookupEnv("MINIO_ADDRESS")
port, portExist := os.LookupEnv("MINIO_PORT")
if portExist && addressExist {
endpoint = "http://" + address + ":" + port
} else if !portExist && addressExist {
return "", errs.Wrap(errors.New("the MINIO_ADDRESS of minio is empty"))
} else if portExist && !addressExist {
return "", errs.Wrap(errors.New("the MINIO_PORT of minio is empty"))
endpoint, err := getMinioAddr("MINIO_ENDPOINT", "MINIO_ADDRESS", "MINIO_PORT", config.Config.Object.Minio.Endpoint)
if err != nil {
return "", err
}
minio := &component.Minio{
@ -179,20 +172,11 @@ func checkRedis() (string, error) {
Password: password,
}
addr, addrExist := os.LookupEnv("REDIS_ADDRESS")
port, portExist := os.LookupEnv("REDIS_PORT")
if addrExist && portExist {
addresses := strings.Split(addr, ",")
for i, address := range addresses {
addresses[i] = address + ":" + port
addresses, err := getAddress("REDIS_ADDRESS", "REDIS_PORT", config.Config.Redis.Address)
if err != nil {
return "", err
}
redis.Address = addresses
} else if !addrExist && portExist {
return "", errs.Wrap(errors.New("the REDIS_ADDRESS of minio is empty"))
} else if addrExist && !portExist {
return "", errs.Wrap(errors.New("the REDIS_PORT of minio is empty"))
}
str, err := component.CheckRedis(redis)
if err != nil {
@ -214,19 +198,11 @@ func checkZookeeper() (string, error) {
Password: getEnv("ZOOKEEPER_PASSWORD", config.Config.Zookeeper.Password),
}
address, addrExist := os.LookupEnv("ZOOKEEPER_ADDRESS")
port, portExist := os.LookupEnv("ZOOKEEPER_PORT")
if addrExist && portExist {
addresses := strings.Split(address, ",")
for i, addr := range addresses {
addresses[i] = addr + ":" + port
addresses, err := getAddress("ZOOKEEPER_ADDRESS", "ZOOKEEPER_PORT", config.Config.Zookeeper.ZkAddr)
if err != nil {
return "", nil
}
zk.ZkAddr = addresses
} else if !addrExist && portExist {
return "", errs.Wrap(errors.New("the ZOOKEEPER_ADDRESS of minio is empty"))
} else if addrExist && !portExist {
return "", errs.Wrap(errors.New("the ZOOKEEPER_PORT of minio is empty"))
}
str, err := component.CheckZookeeper(zk)
if err != nil {
@ -248,19 +224,11 @@ func checkKafka() (string, error) {
Addr: strings.Split(address, ","),
}
address, addrExist := os.LookupEnv("KAFKA_ADDRESS")
port, portExist := os.LookupEnv("KAFKA_PORT")
if addrExist && portExist {
addresses := strings.Split(address, ",")
for i, addr := range addresses {
addresses[i] = addr + ":" + port
addresses, err := getAddress("KAFKA_ADDRESS", "KAFKA_PORT", config.Config.Kafka.Addr)
if err != nil {
return "", nil
}
kafka.Addr = addresses
} else if !addrExist && portExist {
return "", errs.Wrap(errors.New("the KAFKA_ADDRESS of minio is empty"))
} else if addrExist && !portExist {
return "", errs.Wrap(errors.New("the KAFKA_PORT of minio is empty"))
}
str, kafkaClient, err := component.CheckKafka(kafka)
if err != nil {
@ -298,3 +266,43 @@ func isTopicPresent(topic string, topics []string) bool {
}
return false
}
func getAddress(key1, key2 string, fallback []string) ([]string, error) {
address, addrExist := os.LookupEnv(key1)
port, portExist := os.LookupEnv(key2)
if addrExist && portExist {
addresses := strings.Split(address, ",")
for i, addr := range addresses {
addresses[i] = addr + ":" + port
}
return addresses, nil
} else if !addrExist && portExist {
result := make([]string, len(config.Config.Redis.Address))
for i, addr := range config.Config.Redis.Address {
add := strings.Split(addr, ":")
result[i] = add[0] + ":" + port
}
return result, nil
} else if addrExist && !portExist {
return nil, errs.Wrap(errors.New("the ZOOKEEPER_PORT of minio is empty"))
}
return fallback, nil
}
func getMinioAddr(key1, key2, key3, fallback string) (string, error) {
// Prioritize environment variables
endpoint := getEnv(key1, fallback)
address, addressExist := os.LookupEnv(key2)
port, portExist := os.LookupEnv(key3)
if portExist && addressExist {
endpoint = "http://" + address + ":" + port
} else if !portExist && addressExist {
return "", errs.Wrap(errors.New("the MINIO_PORT of minio is empty"))
} else if portExist && !addressExist {
arr := strings.Split(config.Config.Object.Minio.Endpoint, ":")
arr[2] = port
endpoint = strings.Join(arr, ":")
}
return endpoint, nil
}
Write Preview
Loading…
Cancel
Save