blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-11-06 13:22:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-v3.6' into main

Browse Source
This commit is contained in:
skiffer-git 2024-03-08 23:21:01 +08:00 committed by GitHub
commit 17f431b0ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/install/openim-tools.sh
View File

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

4
tools/component/component.go
View File

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