From 958afd61150f183e3aeb4ea228a02f5b2be6749a Mon Sep 17 00:00:00 2001
From: Gordon <46924906+FGadvancer@users.noreply.github.com>
Date: Thu, 17 Aug 2023 21:22:27 +0800
Subject: [PATCH] fix: start don't kill old process (#892)

* fix: to start im or chat, ZooKeeper must be started first.

* fix: msg gateway start output err info

Signed-off-by: Gordon <1432970085@qq.com>

* fix: msg gateway start output err info

Signed-off-by: Gordon <1432970085@qq.com>

* chore: package path changes

Signed-off-by: withchao <993506633@qq.com>

* fix: go mod update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* chore: package path changes

Signed-off-by: withchao <993506633@qq.com>

* chore: package path changes

Signed-off-by: withchao <993506633@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: get all userID

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix: msggateway add online status call

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* refactor: log change

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* refactor: log change

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* chore: network mode change

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* cicd: robot automated Change

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* cicd: robot automated Change

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* cicd: robot automated Change

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* feat: add api of get server time

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* feat: remove go work sum

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* cicd: robot automated Change

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix: pull message add isRead field

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix: check msg-transfer script

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix: start don't kill old process

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

---------

Signed-off-by: Gordon <1432970085@qq.com>
Signed-off-by: withchao <993506633@qq.com>
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: withchao <993506633@qq.com>
Co-authored-by: Xinwei Xiong <3293172751NSS@gmail.com>
Co-authored-by: FGadvancer <FGadvancer@users.noreply.github.com>
---
 scripts/msg_gateway_start.sh  | 10 +++++-----
 scripts/msg_transfer_start.sh | 12 ++++++------
 scripts/push_start.sh         | 10 +++++-----
 scripts/start_cron.sh         | 10 +++++-----
 scripts/start_rpc_service.sh  | 16 ++++++++--------
 5 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/scripts/msg_gateway_start.sh b/scripts/msg_gateway_start.sh
index aa9c2f0ff..f5aa00a4e 100755
--- a/scripts/msg_gateway_start.sh
+++ b/scripts/msg_gateway_start.sh
@@ -50,11 +50,11 @@ if [ ${#rpc_ports[@]} -ne ${#ws_ports[@]} ]; then
 fi
 #Check if the service exists
 #If it is exists,kill this process
-check=$(ps aux | grep -w ./${openim_msggateway} | grep -v grep | wc -l)
-if [ $check -ge 1 ]; then
-  oldPid=$(ps aux | grep -w ./${openim_msggateway} | grep -v grep | awk '{print $2}')
-    kill -9 ${oldPid}
-fi
+#check=$(ps aux | grep -w ./${openim_msggateway} | grep -v grep | wc -l)
+#if [ $check -ge 1 ]; then
+#  oldPid=$(ps aux | grep -w ./${openim_msggateway} | grep -v grep | awk '{print $2}')
+#    kill -9 ${oldPid}
+#fi
 #Waiting port recycling
 sleep 1
 cd ${msg_gateway_binary_root}
diff --git a/scripts/msg_transfer_start.sh b/scripts/msg_transfer_start.sh
index f287ff8fe..c0a24104a 100755
--- a/scripts/msg_transfer_start.sh
+++ b/scripts/msg_transfer_start.sh
@@ -37,12 +37,12 @@ prome_ports=($ports_array)
 
 #Check if the service exists
 #If it is exists,kill this process
-check=`ps  | grep -w ./${openim_msgtransfer} | grep -v grep| wc -l`
-if [ $check -ge 1 ]
-then
-oldPid=`ps  | grep -w ./${openim_msgtransfer} | grep -v grep|awk '{print $2}'`
- kill -9 $oldPid
-fi
+#check=`ps  | grep -w ./${openim_msgtransfer} | grep -v grep| wc -l`
+#if [ $check -ge 1 ]
+#then
+#oldPid=`ps  | grep -w ./${openim_msgtransfer} | grep -v grep|awk '{print $2}'`
+# kill -9 $oldPid
+#fi
 #Waiting port recycling
 sleep 1
 
diff --git a/scripts/push_start.sh b/scripts/push_start.sh
index 37629c70f..d3c2f9a8f 100755
--- a/scripts/push_start.sh
+++ b/scripts/push_start.sh
@@ -44,11 +44,11 @@ prome_ports=($ports_array)
 
 #Check if the service exists
 #If it is exists,kill this process
-check=$(ps  | grep -w ./${push_name} | grep -v grep | wc -l)
-if [ $check -ge 1 ]; then
-  oldPid=$(ps  | grep -w ./${push_name} | grep -v grep | awk '{print $2}')
-  kill -9 $oldPid
-fi
+#check=$(ps  | grep -w ./${push_name} | grep -v grep | wc -l)
+#if [ $check -ge 1 ]; then
+#  oldPid=$(ps  | grep -w ./${push_name} | grep -v grep | awk '{print $2}')
+#  kill -9 $oldPid
+#fi
 #Waiting port recycling
 sleep 1
 cd ${push_binary_root}
diff --git a/scripts/start_cron.sh b/scripts/start_cron.sh
index de964fff4..41b86b4a4 100755
--- a/scripts/start_cron.sh
+++ b/scripts/start_cron.sh
@@ -35,11 +35,11 @@ logs_dir="$OPENIM_ROOT/logs"
 #Check if the service exists
 #If it is exists,kill this process
 check=`ps  | grep -w ./${cron_task_name} | grep -v grep| wc -l`
-if [ $check -ge 1 ]
-then
-oldPid=`ps | grep -w ./${cron_task_name} | grep -v grep|awk '{print $2}'`
- kill -9 $oldPid
-fi
+#if [ $check -ge 1 ]
+#then
+#oldPid=`ps | grep -w ./${cron_task_name} | grep -v grep|awk '{print $2}'`
+# kill -9 $oldPid
+#fi
 #Waiting port recycling
 sleep 1
 
diff --git a/scripts/start_rpc_service.sh b/scripts/start_rpc_service.sh
index 51e13298f..a26f6cf87 100755
--- a/scripts/start_rpc_service.sh
+++ b/scripts/start_rpc_service.sh
@@ -78,14 +78,14 @@ for ((i = 0; i < ${#service_filename[*]}; i++)); do
   service_name="ps |grep -w ${service_filename[$i]} |grep -v grep"
   count="${service_name}| wc -l"
 
-  if [ $(eval ${count}) -gt 0 ]; then
-    pid="${service_name}| awk '{print \$2}'"
-    echo  "${service_filename[$i]} service has been started,pid:$(eval $pid)"
-    echo  "killing the service ${service_filename[$i]} pid:$(eval $pid)"
-    #kill the service that existed
-    kill -9 $(eval $pid)
-    sleep 0.5
-  fi
+#  if [ $(eval ${count}) -gt 0 ]; then
+#    pid="${service_name}| awk '{print \$2}'"
+#    echo  "${service_filename[$i]} service has been started,pid:$(eval $pid)"
+#    echo  "killing the service ${service_filename[$i]} pid:$(eval $pid)"
+#    #kill the service that existed
+#    kill -9 $(eval $pid)
+#    sleep 0.5
+#  fi
   cd $OPENIM_ROOT
   cd $BIN_DIR
   # Get the rpc port in the configuration file