diff --git a/CHANGELOG/CHANGELOG-3.5.0+2.e0bd54f-3-g52f9fc209.md b/CHANGELOG/CHANGELOG-3.5.0+2.e0bd54f-3-g52f9fc209.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/CHANGELOG/CHANGELOG-3.5.0+2.e0bd54f-1-g4ce6a0fa6.md b/CHANGELOG/CHANGELOG-3.5.0+2.e0bd54f-4-g87f685b17.md similarity index 100% rename from CHANGELOG/CHANGELOG-3.5.0+2.e0bd54f-1-g4ce6a0fa6.md rename to CHANGELOG/CHANGELOG-3.5.0+2.e0bd54f-4-g87f685b17.md diff --git a/CHANGELOG/CHANGELOG-3.5.0+2.e0bd54f.md b/CHANGELOG/CHANGELOG-3.5.0+2.e0bd54f.md deleted file mode 100644 index 006398fa7..000000000 --- a/CHANGELOG/CHANGELOG-3.5.0+2.e0bd54f.md +++ /dev/null @@ -1,15 +0,0 @@ -# Version logging for OpenIM - - - - - - -## [Unreleased] - - - -## [v3.5.0+2.e0bd54f] - 2024-01-12 - -[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v3.5.0+2.e0bd54f...HEAD -[v3.5.0+2.e0bd54f]: https://github.com/openimsdk/open-im-server/compare/v3.5.0+6.a09200e...v3.5.0+2.e0bd54f diff --git a/CHANGELOG/CHANGELOG-3.5.0+6.a09200e.md b/CHANGELOG/CHANGELOG-3.5.0+6.a09200e.md deleted file mode 100644 index 25f9414a6..000000000 --- a/CHANGELOG/CHANGELOG-3.5.0+6.a09200e.md +++ /dev/null @@ -1,15 +0,0 @@ -# Version logging for OpenIM - - - - - - -## [Unreleased] - - - -## [v3.5.0+6.a09200e] - 2024-01-12 - -[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v3.5.0+6.a09200e...HEAD -[v3.5.0+6.a09200e]: https://github.com/openimsdk/open-im-server/compare/v3.5.0+1.b3d009b...v3.5.0+6.a09200e diff --git a/scripts/check-all.sh b/scripts/check-all.sh index 7b53e4a89..72a34a5e5 100755 --- a/scripts/check-all.sh +++ b/scripts/check-all.sh @@ -30,6 +30,7 @@ OPENIM_VERBOSE=4 openim::log::info "\n# Begin to check all openim service" +openim::log::status "Check all dependent service ports" # Elegant printing function # Elegant printing function print_services_and_ports() { @@ -60,7 +61,7 @@ print_services_and_ports "${OPENIM_DEPENDENCY_TARGETS[@]}" "${OPENIM_DEPENDENCY_ # OpenIM check echo "++ The port being checked: ${OPENIM_SERVER_PORT_LISTARIES[@]}" openim::log::info "\n## Check all dependent service ports" -echo "+++ The port being checked: ${OPENIM_DEPENDENCY_PORT_LISTARIES[@]}" +echo "++ The port being checked: ${OPENIM_DEPENDENCY_PORT_LISTARIES[@]}" set +e diff --git a/scripts/install/openim-tools.sh b/scripts/install/openim-tools.sh index a369a8158..385df64f5 100755 --- a/scripts/install/openim-tools.sh +++ b/scripts/install/openim-tools.sh @@ -103,8 +103,13 @@ function openim::tools::start_service() { printf "Specifying prometheus port: %s\n" "${prometheus_port}" cmd="${cmd} --prometheus_port ${prometheus_port}" fi - openim::log::info "Starting ${binary_name}..." - ${cmd} >> "${LOG_FILE}" 2>&1 & + openim::log::status "Starting ${binary_name}..." + # Later, after discarding Docker, the Docker keyword is unreliable, and Kubepods is used + if grep -qE 'docker|kubepods' /proc/1/cgroup || [ -f /.dockerenv ]; then + ${cmd} >> "${LOG_FILE}" 2>&1 + else + ${cmd} | tee -a "${LOG_FILE}" + fi } function openim::tools::start() { diff --git a/scripts/lib/release.sh b/scripts/lib/release.sh index c1ab1fef9..a09fd590c 100755 --- a/scripts/lib/release.sh +++ b/scripts/lib/release.sh @@ -628,6 +628,7 @@ function openim::release::github_release() { --repo ${OPENIM_GITHUB_REPO} \ --tag ${OPENIM_GIT_VERSION} \ --name ${ARTIFACT} \ + --label "openim-${OPENIM_GIT_VERSION}" \ --file ${RELEASE_TARS}/${ARTIFACT} for file in ${RELEASE_TARS}/*.tar.gz; do @@ -638,6 +639,7 @@ function openim::release::github_release() { --user ${OPENIM_GITHUB_ORG} \ --repo ${OPENIM_GITHUB_REPO} \ --tag ${OPENIM_GIT_VERSION} \ + --label "openim-${OPENIM_GIT_VERSION}" \ --name "${filename}" \ --file "${file}" fi diff --git a/scripts/stop-all.sh b/scripts/stop-all.sh index c3d07744e..692d2d1e4 100755 --- a/scripts/stop-all.sh +++ b/scripts/stop-all.sh @@ -36,7 +36,7 @@ echo -e "\n++ Stop all processes in the path ${OPENIM_OUTPUT_HOSTBIN}" openim::util::stop_services_with_name "${OPENIM_OUTPUT_HOSTBIN}" -echo -n "Stopping services" +echo -n "Stopping services 15 seconds." for i in {1..15}; do echo -n "." sleep 1