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 the minio env

Browse Source
This commit is contained in:
luhaoling 2024-01-30 14:33:56 +08:00
parent 922058b868
commit a2839192af
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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