Merge branch 'release-v3.6' into main-test111

pull/2051/head
OpenIM-Gordon 2 years ago committed by GitHub
commit beb4bee95a
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}" 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

@ -112,7 +112,6 @@ func main() {
checks[index].flag = true checks[index].flag = true
} }
} }
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") ||

Loading…
Cancel
Save