From 5cce0328220cca7d9c16569b3d73860923466a0c Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong (cubxxw)" <3293172751nss@gmail.com> Date: Fri, 2 Feb 2024 21:45:59 +0800 Subject: [PATCH] fix: fix this bug scripts --- a.md | 18 +++++++++ b.md | 18 +++++++++ pkg/common/startrpc/start.go | 4 +- scripts/lib/util.sh | 4 +- x.md | 71 ++++++++++++++++++++++++++++++++++++ 5 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 a.md create mode 100644 b.md create mode 100644 x.md diff --git a/a.md b/a.md new file mode 100644 index 000000000..6087a4097 --- /dev/null +++ b/a.md @@ -0,0 +1,18 @@ +nohup: ignoring input + + +exit -1: +timeout exit +github.com/OpenIMSDK/tools/errs.Wrap + /home/smile/go/pkg/mod/github.com/!open!i!m!s!d!k/tools@v0.0.33/errs/coderr.go:126 +github.com/openimsdk/open-im-server/v3/pkg/common/startrpc.Start + /data/workspaces/open-im-server/pkg/common/startrpc/start.go:150 +github.com/openimsdk/open-im-server/v3/pkg/common/cmd.(*RpcCmd).StartSvr + /data/workspaces/open-im-server/pkg/common/cmd/rpc.go:53 +main.main + /data/workspaces/open-im-server/cmd/openim-rpc/openim-rpc-third/main.go:32 +runtime.main + /usr/local/go/src/runtime/proc.go:267 +runtime.goexit + /usr/local/go/src/runtime/asm_amd64.s:1650 + diff --git a/b.md b/b.md new file mode 100644 index 000000000..6087a4097 --- /dev/null +++ b/b.md @@ -0,0 +1,18 @@ +nohup: ignoring input + + +exit -1: +timeout exit +github.com/OpenIMSDK/tools/errs.Wrap + /home/smile/go/pkg/mod/github.com/!open!i!m!s!d!k/tools@v0.0.33/errs/coderr.go:126 +github.com/openimsdk/open-im-server/v3/pkg/common/startrpc.Start + /data/workspaces/open-im-server/pkg/common/startrpc/start.go:150 +github.com/openimsdk/open-im-server/v3/pkg/common/cmd.(*RpcCmd).StartSvr + /data/workspaces/open-im-server/pkg/common/cmd/rpc.go:53 +main.main + /data/workspaces/open-im-server/cmd/openim-rpc/openim-rpc-third/main.go:32 +runtime.main + /usr/local/go/src/runtime/proc.go:267 +runtime.goexit + /usr/local/go/src/runtime/asm_amd64.s:1650 + diff --git a/pkg/common/startrpc/start.go b/pkg/common/startrpc/start.go index f7b547834..f6cda2ffb 100644 --- a/pkg/common/startrpc/start.go +++ b/pkg/common/startrpc/start.go @@ -17,7 +17,6 @@ package startrpc import ( "errors" "fmt" - "log" "net" "net/http" "os" @@ -117,7 +116,8 @@ func Start( // Create a HTTP server for prometheus. httpServer := &http.Server{Handler: promhttp.HandlerFor(reg, promhttp.HandlerOpts{}), Addr: fmt.Sprintf("0.0.0.0:%d", prometheusPort)} if err := httpServer.ListenAndServe(); err != nil { - log.Fatal("Unable to start a http server. ", err.Error(), "PrometheusPort:", prometheusPort) + fmt.Fprintf(os.Stderr, "\n\nexit -1: \n%+v PrometheusPort: %d \n\n", err, prometheusPort) + os.Exit(-1) } } return nil diff --git a/scripts/lib/util.sh b/scripts/lib/util.sh index b93f45205..59350e2c7 100755 --- a/scripts/lib/util.sh +++ b/scripts/lib/util.sh @@ -451,8 +451,8 @@ openim::util::check_process_names() { cat "$TMP_LOG_FILE" | awk '{print "\033[31m" $0 "\033[0m"}' return 1 else - echo "" openim::log::success "All processes are running." + echo "" return 0 fi } @@ -1691,8 +1691,8 @@ openim::util::check_process_names() { cat "$TMP_LOG_FILE" | awk '{print "\033[31m" $0 "\033[0m"}' return 1 else - echo "" openim::log::success "All processes are running." + echo "" return 0 fi } diff --git a/x.md b/x.md new file mode 100644 index 000000000..75ef2a032 --- /dev/null +++ b/x.md @@ -0,0 +1,71 @@ +nohup: ignoring input +configFolderPath: /data/workspaces/open-im-server/config +use config /data/workspaces/open-im-server/config/config.yaml +use config /data/workspaces/open-im-server/config/notification.yaml +start Third server, port: 10190, prometheusPort: 21301, OpenIM version: 3.5.1 + + + +exit -1: +listen tcp 0.0.0.0:10190: bind: address already in use +0.0.0.0, 10190 +github.com/OpenIMSDK/tools/errs.Wrap + /home/smile/go/pkg/mod/github.com/!open!i!m!s!d!k/tools@v0.0.33/errs/coderr.go:128 +github.com/openimsdk/open-im-server/v3/pkg/common/startrpc.Start + /data/workspaces/open-im-server/pkg/common/startrpc/start.go:65 +github.com/openimsdk/open-im-server/v3/pkg/common/cmd.(*RpcCmd).StartSvr + /data/workspaces/open-im-server/pkg/common/cmd/rpc.go:53 +main.main + /data/workspaces/open-im-server/cmd/openim-rpc/openim-rpc-third/main.go:32 +runtime.main + /usr/local/go/src/runtime/proc.go:267 +runtime.goexit + /usr/local/go/src/runtime/asm_amd64.s:1650 + +nohup: ignoring input +configFolderPath: /data/workspaces/open-im-server/config +use config /data/workspaces/open-im-server/config/config.yaml +use config /data/workspaces/open-im-server/config/notification.yaml +start Third server, port: 10190, prometheusPort: 21301, OpenIM version: 3.5.1 + + + +exit -1: +listen tcp 0.0.0.0:10190: bind: address already in use +0.0.0.0, 10190 +github.com/OpenIMSDK/tools/errs.Wrap + /home/smile/go/pkg/mod/github.com/!open!i!m!s!d!k/tools@v0.0.33/errs/coderr.go:128 +github.com/openimsdk/open-im-server/v3/pkg/common/startrpc.Start + /data/workspaces/open-im-server/pkg/common/startrpc/start.go:65 +github.com/openimsdk/open-im-server/v3/pkg/common/cmd.(*RpcCmd).StartSvr + /data/workspaces/open-im-server/pkg/common/cmd/rpc.go:53 +main.main + /data/workspaces/open-im-server/cmd/openim-rpc/openim-rpc-third/main.go:32 +runtime.main + /usr/local/go/src/runtime/proc.go:267 +runtime.goexit + /usr/local/go/src/runtime/asm_amd64.s:1650 + +nohup: ignoring input +configFolderPath: /data/workspaces/open-im-server/config +use config /data/workspaces/open-im-server/config/config.yaml +use config /data/workspaces/open-im-server/config/notification.yaml +start Third server, port: 10190, prometheusPort: 21301, OpenIM version: 3.5.1 + + + +exit -1: +timeout exit +github.com/OpenIMSDK/tools/errs.Wrap + /home/smile/go/pkg/mod/github.com/!open!i!m!s!d!k/tools@v0.0.33/errs/coderr.go:126 +github.com/openimsdk/open-im-server/v3/pkg/common/startrpc.Start + /data/workspaces/open-im-server/pkg/common/startrpc/start.go:150 +github.com/openimsdk/open-im-server/v3/pkg/common/cmd.(*RpcCmd).StartSvr + /data/workspaces/open-im-server/pkg/common/cmd/rpc.go:53 +main.main + /data/workspaces/open-im-server/cmd/openim-rpc/openim-rpc-third/main.go:32 +runtime.main + /usr/local/go/src/runtime/proc.go:267 +runtime.goexit + /usr/local/go/src/runtime/asm_amd64.s:1650 +