blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-12-02 18:34:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix this bug scripts

Browse Source
This commit is contained in:
Xinwei Xiong (cubxxw) 2024-02-02 21:11:29 +08:00
parent f3cf608e3e
commit 1b914896a9
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/common/startrpc/start.go
View File

@ -17,7 +17,6 @@ package startrpc
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/OpenIMSDK/tools/errs"
"log" "log"
"net" "net"
"net/http" "net/http"
@ -28,6 +27,8 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/OpenIMSDK/tools/errs"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
@ -116,7 +117,7 @@ func Start(
// Create a HTTP server for prometheus. // Create a HTTP server for prometheus.
httpServer := &http.Server{Handler: promhttp.HandlerFor(reg, promhttp.HandlerOpts{}), Addr: fmt.Sprintf("0.0.0.0:%d", prometheusPort)} httpServer := &http.Server{Handler: promhttp.HandlerFor(reg, promhttp.HandlerOpts{}), Addr: fmt.Sprintf("0.0.0.0:%d", prometheusPort)}
if err := httpServer.ListenAndServe(); err != nil { if err := httpServer.ListenAndServe(); err != nil {
log.Fatal("Unable to start a http server.") log.Fatal("Unable to start a http server. ", err.Error(), "PrometheusPort:", prometheusPort)
} }
} }
return nil return nil

1
scripts/install/openim-crontask.sh
View File

@ -53,6 +53,7 @@ function openim::crontask::start() {
openim::util::stop_services_with_name ${OPENIM_CRONTASK_BINARY} openim::util::stop_services_with_name ${OPENIM_CRONTASK_BINARY}
openim::log::status "start cron_task process, path: ${OPENIM_CRONTASK_BINARY}" openim::log::status "start cron_task process, path: ${OPENIM_CRONTASK_BINARY}"
nohup ${OPENIM_CRONTASK_BINARY} -c ${OPENIM_PUSH_CONFIG} >> ${LOG_FILE} 2> >(tee -a "${STDERR_LOG_FILE}" "$TMP_LOG_FILE") & nohup ${OPENIM_CRONTASK_BINARY} -c ${OPENIM_PUSH_CONFIG} >> ${LOG_FILE} 2> >(tee -a "${STDERR_LOG_FILE}" "$TMP_LOG_FILE") &
openim::util::check_process_names ${SERVER_NAME} openim::util::check_process_names ${SERVER_NAME}

1
scripts/install/openim-rpc.sh
View File

@ -125,6 +125,7 @@ function openim::rpc::start() {
for ((i = 0; i < ${#OPENIM_RPC_SERVICE_LISTARIES[*]}; i++)); do for ((i = 0; i < ${#OPENIM_RPC_SERVICE_LISTARIES[*]}; i++)); do
# openim::util::stop_services_with_name ${OPENIM_RPC_SERVICE_LISTARIES # openim::util::stop_services_with_name ${OPENIM_RPC_SERVICE_LISTARIES
openim::util::stop_services_on_ports ${OPENIM_RPC_PORT_LISTARIES[$i]} openim::util::stop_services_on_ports ${OPENIM_RPC_PORT_LISTARIES[$i]}
openim::util::stop_services_on_ports ${OPENIM_RPC_PROM_PORT_LISTARIES[$i]}
openim::log::info "OpenIM ${OPENIM_RPC_SERVICE_LISTARIES[$i]} config path: ${OPENIM_RPC_CONFIG}" openim::log::info "OpenIM ${OPENIM_RPC_SERVICE_LISTARIES[$i]} config path: ${OPENIM_RPC_CONFIG}"

2
scripts/lib/util.sh
View File

@ -451,6 +451,7 @@ openim::util::check_process_names() {
cat "$TMP_LOG_FILE" | awk '{print "\033[31m" $0 "\033[0m"}' cat "$TMP_LOG_FILE" | awk '{print "\033[31m" $0 "\033[0m"}'
return 1 return 1
else else
echo ""
openim::log::success "All processes are running." openim::log::success "All processes are running."
return 0 return 0
fi fi
@ -1690,6 +1691,7 @@ openim::util::check_process_names() {
cat "$TMP_LOG_FILE" | awk '{print "\033[31m" $0 "\033[0m"}' cat "$TMP_LOG_FILE" | awk '{print "\033[31m" $0 "\033[0m"}'
return 1 return 1
else else
echo ""
openim::log::success "All processes are running." openim::log::success "All processes are running."
return 0 return 0
fi fi