diff --git a/internal/rpc/third/third.go b/internal/rpc/third/third.go index 5f6fc6c34..928fb0f42 100644 --- a/internal/rpc/third/third.go +++ b/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" diff --git a/pkg/common/db/mgo/object.go b/pkg/common/db/mgo/object.go index a527fa60d..e9d639f19 100644 --- a/pkg/common/db/mgo/object.go +++ b/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" diff --git a/pkg/rpcclient/msg.go b/pkg/rpcclient/msg.go index 4daf897a1..54a4671a3 100644 --- a/pkg/rpcclient/msg.go +++ b/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" ) diff --git a/scripts/check-all.sh b/scripts/check-all.sh index 4850357b4..d41023384 100755 --- a/scripts/check-all.sh +++ b/scripts/check-all.sh @@ -31,7 +31,6 @@ if openim::util::is_running_in_container; then fi - OPENIM_VERBOSE=4 openim::log::info "\n# Begin to check all openim service" @@ -105,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 diff --git a/scripts/start-all.sh b/scripts/start-all.sh index a3d5ede54..419c16628 100755 --- a/scripts/start-all.sh +++ b/scripts/start-all.sh @@ -67,6 +67,7 @@ if openim::util::is_running_in_container; then fi + openim::golang::check_openim_binaries if [[ $? -ne 0 ]]; then openim::log::error "OpenIM binaries are not found. Please run 'make build' to build binaries."