Merge branch 'release-v3.6' into main

pull/2054/head
skiffer-git 2 years ago committed by GitHub
commit 17f431b0ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -101,7 +101,13 @@ function openim::tools::start_service() {
cmd="${cmd} --prometheus_port ${prometheus_port}"
fi
openim::log::status "Starting binary ${binary_name}..."
${cmd}
local status=$?
if [ $status -eq 0 ]; then

@ -80,6 +80,7 @@ func main() {
return
}
checks := []checkFunc{
//{name: "Mysql", function: checkMysql},
{name: "Mongo", function: checkMongo, config: conf},
@ -101,6 +102,7 @@ func main() {
if !check.flag {
err = check.function(check.config)
if err != nil {
if check.name == "Minio" {
if errors.Is(err, errMinioNotEnabled) ||
errors.Is(err, errSignEndPoint) ||
@ -109,7 +111,7 @@ func main() {
checks[index].flag = true
continue
}
}
allSuccess = false
component.ErrorPrint(fmt.Sprintf("Check component: %s failed:%v.", check.name, err.Error()))
break

Loading…
Cancel
Save