blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-23 09:50:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-v3.6' into fix-bug-2039-3.6

Browse Source
This commit is contained in:
skiffer-git 2024-03-08 16:11:27 +08:00 committed by GitHub
commit ed45f6f860
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,11 @@ 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

2
tools/component/component.go
View File

@ -102,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) {
fmt.Println(err.Error(), " check ", check.name) fmt.Println(err.Error(), " check ", check.name)
@ -113,6 +114,7 @@ func main() {
} }
} }
component.ErrorPrint(fmt.Sprintf("Starting %s failed:%v.", check.name, errs.Unwrap(err).Error())) component.ErrorPrint(fmt.Sprintf("Starting %s failed:%v.", check.name, errs.Unwrap(err).Error()))
if strings.Contains(errs.Unwrap(err).Error(), "connection refused") || if strings.Contains(errs.Unwrap(err).Error(), "connection refused") ||
strings.Contains(errs.Unwrap(err).Error(), "timeout") || strings.Contains(errs.Unwrap(err).Error(), "timeout") ||