Merge remote-tracking branch 'origin/main' into localcache

CHANGELOG/CHANGELOG-3.6.md

@@ -0,0 +1,20 @@
+# Version logging for OpenIM
+
+<!-- BEGIN MUNGE: GENERATED_TOC -->
+
+<!-- END MUNGE: GENERATED_TOC -->
+
+<a name="unreleased"></a>
+## [Unreleased]
+
+
+<a name="v3.6.0"></a>
+## v3.6.0 - 2024-03-07
+### Reverts
+- update etcd to v3.5.2 ([#206](https://github.com/openimsdk/open-im-server/issues/206))
+
+### Pull Requests
+- Merge branch 'tuoyun'
+
+
+[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v3.6.0...HEAD

internal/rpc/third/third.go

@@ -17,12 +17,12 @@ package third
 import (
 	"context"
 	"fmt"
-	"github.com/OpenIMSDK/tools/errs"
 	"net/url"
 	"time"
 
 	"github.com/OpenIMSDK/protocol/third"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
+	"github.com/OpenIMSDK/tools/errs"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/cache"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/controller"

pkg/common/config/version

@@ -1 +1 @@
-3.5.1
+3.6.0

pkg/common/db/mgo/object.go

@@ -16,8 +16,8 @@ package mgo
 
 import (
 	"context"
-	"github.com/OpenIMSDK/tools/errs"
 
+	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/mgoutil"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 	"go.mongodb.org/mongo-driver/bson"

pkg/rpcclient/msg.go

@@ -18,16 +18,16 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/OpenIMSDK/tools/errs"
-	util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
 
 	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/msg"
 	"github.com/OpenIMSDK/protocol/sdkws"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
+	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/utils"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
+	util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/proto"
 )

scripts/check-all.sh

@@ -26,6 +26,11 @@
 OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${OPENIM_ROOT}/scripts/install/common.sh"
 
+if openim::util::is_running_in_container; then
+  exec >> ${DOCKER_LOG_FILE} 2>&1
+fi
+
+
 OPENIM_VERBOSE=4
 
 openim::log::info "\n# Begin to check all openim service"
@@ -70,7 +75,7 @@ if grep -qE 'docker|kubepods' /proc/1/cgroup || [ -f /.dockerenv ]; then
   openim::color::echo ${COLOR_CYAN} "Environment in the interior of the container"
 else
   openim::color::echo ${COLOR_CYAN} "The environment is outside the container"
-  openim::util::check_ports ${OPENIM_DEPENDENCY_PORT_LISTARIES[@]} || return 0
+  openim::util::check_ports ${OPENIM_DEPENDENCY_PORT_LISTARIES[@]}
 fi
 
 if [[ $? -ne 0 ]]; then
@@ -99,6 +104,7 @@ if [[ $? -ne 0 ]]; then
   echo "+++ cat openim log file >>> ${LOG_FILE}"
   openim::log::error "check process failed.\n "
   echo "$result"
+  exit 1
 else
   openim::log::success "All openim services are running normally! "
 fi

scripts/docker-start-all.sh

@@ -23,15 +23,7 @@
 
 OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${OPENIM_ROOT}/scripts/install/common.sh"
-
 openim::log::info "\n# Use Docker to start all openim service"
-
 trap 'openim::util::onCtrlC' INT
-
 "${OPENIM_ROOT}"/scripts/start-all.sh
-
-sleep 5
-
-"${OPENIM_ROOT}"/scripts/check-all.sh
-
-tail -f ${LOG_FILE}
+tail -f ${DOCKER_LOG_FILE}

scripts/install/openim-tools.sh

@@ -101,7 +101,16 @@ function openim::tools::start_service() {
     cmd="${cmd} --prometheus_port ${prometheus_port}"
   fi
   openim::log::status "Starting binary ${binary_name}..."
-  ${cmd} | tee -a "${LOG_FILE}"
+ ${cmd} 
+ local status=$?
+
+    if [ $status -eq 0 ]; then
+        openim::log::info "Service ${binary_name} started successfully."
+        return 0
+    else
+        openim::log::error "Failed to start service ${binary_name}."
+        return 1
+    fi
 }
 
 function openim::tools::start() {
@@ -115,11 +124,15 @@ function openim::tools::start() {
 
 
 function openim::tools::pre-start() {
-    openim::log::info "Preparing to start OpenIM Tools..."
-    for tool in "${OPENIM_TOOLS_PRE_START_NAME_LISTARIES[@]}"; do
-        openim::log::info "Starting tool ${tool}..."
-        openim::tools::start_service ${tool} ${OPNEIM_CONFIG}
-    done
+   openim::log::info "Preparing to start OpenIM Tools..."
+      for tool in "${OPENIM_TOOLS_PRE_START_NAME_LISTARIES[@]}"; do
+          openim::log::info "Starting tool ${tool}..."
+          if ! openim::tools::start_service ${tool} ${OPNEIM_CONFIG}; then
+              openim::log::error "Failed to start ${tool}, aborting..."
+              return 1
+          fi
+      done
+      openim::log::info "All tools started successfully."
 }
 
 function openim::tools::post-start() {

scripts/lib/logging.sh

@@ -28,7 +28,7 @@ fi
 LOG_FILE="${OPENIM_OUTPUT}/logs/openim-$(date '+%Y%m%d').log"
 STDERR_LOG_FILE="${OPENIM_OUTPUT}/logs/openim-error-$(date '+%Y%m%d').log"
 TMP_LOG_FILE="${OPENIM_OUTPUT}/logs/openim-tmp-$(date '+%Y%m%d').log"
-
+DOCKER_LOG_FILE="${OPENIM_OUTPUT}/logs/openim-docker.log"
 if [[ ! -d "${OPENIM_OUTPUT}/logs" ]]; then
   mkdir -p "${OPENIM_OUTPUT}/logs"
   touch "$LOG_FILE"
@@ -36,6 +36,12 @@ if [[ ! -d "${OPENIM_OUTPUT}/logs" ]]; then
   touch "$TMP_LOG_FILE"
 fi
 
+if [[ ! -f "$DOCKER_LOG_FILE" ]]; then
+  touch "$DOCKER_LOG_FILE"
+fi
+
+
+
 # Define the logging function
 function echo_log() {
   if $ENABLE_LOGGING; then

scripts/lib/util.sh

@@ -2866,6 +2866,15 @@ function openim::util::gen_os_arch() {
 
 
 
+function openim::util::is_running_in_container() {
+  if grep -qE 'docker|kubepods' /proc/1/cgroup || [ -f /.dockerenv ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+
 function openim::util::check_process_names_for_stop() {
   local all_stopped=true
   for service in "${OPENIM_ALL_SERVICE_LIBRARIES[@]}"; do

scripts/start-all.sh

@@ -17,12 +17,17 @@
 #FIXME The full names of the shell scripts that need to be started are placed in the `need_to_start_server_shell` array.
 
 
+#!/bin/bash
+
+
+
 
 
 OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${OPENIM_ROOT}/scripts/install/common.sh"
 
 
+
 # Function to execute the scripts.
 function execute_start_scripts() {
   for script_path in "${OPENIM_SERVER_SCRIPT_START_LIST[@]}"; do
@@ -57,6 +62,9 @@ function execute_start_scripts() {
 
 
 
+if openim::util::is_running_in_container; then
+  exec > ${DOCKER_LOG_FILE} 2>&1
+fi
 
 
 
@@ -75,10 +83,18 @@ fi
 # TODO Prelaunch tools, simple for now, can abstract functions later
 TOOLS_START_SCRIPTS_PATH=${START_SCRIPTS_PATH}/openim-tools.sh
 
-openim::log::status "\n## Pre Starting OpenIM services"
-${TOOLS_START_SCRIPTS_PATH} openim::tools::pre-start
+openim::log::print_blue "\n## Pre Starting OpenIM services"
 
 
+
+if ! ${TOOLS_START_SCRIPTS_PATH} openim::tools::pre-start; then
+  openim::log::error "Pre Starting OpenIM services failed, aborting..."
+  exit 1
+fi
+
+
+openim::log::print_blue "Pre Starting OpenIM services processed successfully"
+
 result=$("${OPENIM_ROOT}"/scripts/stop-all.sh)
 if [[ $? -ne 0 ]]; then
   openim::log::error "View the error logs from this startup. ${LOG_FILE} \n"

tools/component/component.go

@@ -102,7 +102,14 @@ func main() {
 			if !check.flag {
 				err = check.function(check.config)
 				if err != nil {
-					allSuccess = false
+					if errors.Is(err, errMinioNotEnabled) {
+						fmt.Println(err.Error())
+						checks[index].flag = true
+					}
+					if errors.Is(err, errSignEndPoint) {
+						fmt.Fprintf(os.Stderr, err.Error())
+						checks[index].flag = true
+					}
 					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 waiting") {
@@ -125,6 +132,11 @@ func main() {
 	os.Exit(-1)
 }
 
+var errMinioNotEnabled = errors.New("minio.Enable is not configured to use MinIO")
+
+var errSignEndPoint = errors.New("minio.signEndPoint contains 127.0.0.1, causing issues with image sending")
+var errApiURL = errors.New("object.apiURL contains 127.0.0.1, causing issues with image sending")
+
 // checkMongo checks the MongoDB connection without retries
 func checkMongo(config *config.GlobalConfig) error {
 	mongoStu := &component.Mongo{
@@ -153,10 +165,16 @@ func checkRedis(config *config.GlobalConfig) error {
 
 // checkMinio checks the MinIO connection
 func checkMinio(config *config.GlobalConfig) error {
-	// Check if MinIO is enabled
-	if config.Object.Enable != "minio" {
-		return errs.Wrap(errors.New("minio.Enable is empty"))
+	if strings.Contains(config.Object.ApiURL, "127.0.0.1") {
+		return errs.Wrap(errApiURL, "config.Object.ApiURL: "+config.Object.ApiURL)
 	}
+	if config.Object.Enable != "minio" {
+		return errs.Wrap(errMinioNotEnabled, "config.Object.Enable: "+config.Object.Enable)
+	}
+	if strings.Contains(config.Object.Minio.Endpoint, "127.0.0.1") {
+		return errs.Wrap(errSignEndPoint, "config.Object.Minio.Endpoint: "+config.Object.Minio.Endpoint)
+	}
+
 	minio := &component.Minio{
 		ApiURL:          config.Object.ApiURL,
 		Endpoint:        config.Object.Minio.Endpoint,