Merge remote-tracking branch 'upstream/release-v3.6' into localcache36

# Conflicts:
#	scripts/install/openim-tools.sh
This commit is contained in:
withchao 2024-03-08 15:23:00 +08:00
commit 9f67a41189

View File

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