fxi: component check output valid info.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
pull/1104/head
Gordon 2 years ago
parent f185f09af7
commit 8d9e112fb1

@ -22,7 +22,6 @@ import (
"net" "net"
"net/url" "net/url"
"os" "os"
"strings"
"time" "time"
"github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7"
@ -117,16 +116,24 @@ func main() {
os.Exit(1) os.Exit(1)
} }
func exactIP(urll string) string { func checkMinioIP() error {
u, _ := url.Parse(urll) for _, i := range []string{config.Config.Object.ApiURL, config.Config.Object.Minio.SignEndpoint} {
u, err := url.Parse(i)
if err != nil {
return utils.Wrap(err, "api format error,please check config file apiURL or Minio SignEndpoint")
}
if u.Scheme == "https" {
continue
}
host, _, err := net.SplitHostPort(u.Host) host, _, err := net.SplitHostPort(u.Host)
if err != nil { if err != nil {
host = u.Host host = u.Host
} }
if strings.HasSuffix(host, ":") { if host == "127.0.0.1" {
host = host[0 : len(host)-1] return ErrConfig.Wrap("apiURL or Minio SignEndpoint endpoint contain 127.0.0.1,please modify it")
} }
return host }
return nil
} }
func checkMysql() error { func checkMysql() error {
@ -205,8 +212,8 @@ func checkMinio() error {
return ErrComponentStart.Wrap("Minio server is offline") return ErrComponentStart.Wrap("Minio server is offline")
} }
} }
if exactIP(config.Config.Object.ApiURL) == "127.0.0.1" || exactIP(config.Config.Object.Minio.SignEndpoint) == "127.0.0.1" { if checkMinioIP() != nil {
return ErrConfig.Wrap("apiURL or Minio SignEndpoint endpoint contain 127.0.0.1") return checkMinioIP()
} }
} }
return nil return nil

Loading…
Cancel
Save