Skip to content

Commit

Permalink
Merge branch 'release-v3.6' into fix-bug-2039-3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
skiffer-git committed Mar 8, 2024
2 parents caed252 + a534134 commit ed45f6f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions scripts/install/openim-tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,11 @@ 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
Expand Down
2 changes: 2 additions & 0 deletions tools/component/component.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,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) {
fmt.Println(err.Error(), " check ", check.name)
Expand All @@ -113,6 +114,7 @@ func main() {
}
}


component.ErrorPrint(fmt.Sprintf("Starting %s failed:%v.", check.name, errs.Unwrap(err).Error()))
if strings.Contains(errs.Unwrap(err).Error(), "connection refused") ||
strings.Contains(errs.Unwrap(err).Error(), "timeout") ||
Expand Down

0 comments on commit ed45f6f

Please sign in to comment.