From 37431a76b694d2046d1e403cf9a04ac3979c8d64 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 16 Nov 2023 03:07:51 +0800
Subject: [PATCH] update

---
 plugins/haproxy/install.sh                       |  8 +++++---
 plugins/keepalived/config/keepalived.backup.conf |  2 +-
 plugins/keepalived/index.py                      |  2 ++
 plugins/keepalived/install.sh                    | 10 +++++++++-
 plugins/keepalived/scripts/chk_mysql.sh          |  9 ++++++++-
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/plugins/haproxy/install.sh b/plugins/haproxy/install.sh
index 53e90126f..d22eb66d4 100755
--- a/plugins/haproxy/install.sh
+++ b/plugins/haproxy/install.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
-export PATH
+
+# for mac
+export PATH=$PATH:/opt/homebrew/bin
 
 curPath=`pwd`
 rootPath=$(dirname "$curPath")
@@ -23,12 +25,12 @@ else
 fi
 
 if [ "${2}" == "" ];then
-	echo '缺少安装脚本...' > $install_tmp
+	echo '缺少安装脚本...'
 	exit 0
 fi 
 
 if [ ! -d $curPath/versions/$2 ];then
-	echo '缺少安装脚本2...' > $install_tmp
+	echo '缺少安装脚本2...'
 	exit 0
 fi
 
diff --git a/plugins/keepalived/config/keepalived.backup.conf b/plugins/keepalived/config/keepalived.backup.conf
index 6891484a8..124063410 100644
--- a/plugins/keepalived/config/keepalived.backup.conf
+++ b/plugins/keepalived/config/keepalived.backup.conf
@@ -20,7 +20,7 @@ vrrp_script chk_mysql_port {
     script "{$PLUGIN_PATH}/scripts/chk_mysql.sh"
     #脚本执行间隔，每2s检测一次
     interval 2
-    #脚本结果导致的优先级变更，检测失败（脚本返回非0）则优先级 -5         
+    #脚本结果导致的优先级变更，检测失败（脚本返回非0）则优先级 -5
     weight –5
     #检测连续2次失败才算确定是真失败。会用weight减少优先级（1-255之间）              
     fall 2
diff --git a/plugins/keepalived/index.py b/plugins/keepalived/index.py
index b96584fa0..4d326c899 100755
--- a/plugins/keepalived/index.py
+++ b/plugins/keepalived/index.py
@@ -120,6 +120,8 @@ def initDreplace():
         mw.writeFile(dst_conf, conf_content)
         mw.writeFile(dst_conf_init, 'ok')
 
+    # route -n | grep ^0.0.0.0 | awk '{print $8}'
+
     # systemd
     systemDir = mw.systemdCfgDir()
     systemService = systemDir + '/' + getPluginName() + '.service'
diff --git a/plugins/keepalived/install.sh b/plugins/keepalived/install.sh
index 112ce0e55..067777cbb 100755
--- a/plugins/keepalived/install.sh
+++ b/plugins/keepalived/install.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
-export PATH
+
+# for mac
+export PATH=$PATH:/opt/homebrew/bin
 
 curPath=`pwd`
 rootPath=$(dirname "$curPath")
@@ -51,6 +53,8 @@ Install_App()
 
 	./configure --prefix=$serverPath/keepalived && make && make install
 
+	# for test
+	# mkdir -p $serverPath/keepalived
 	if [ -d $serverPath/keepalived ];then
 		echo "${VERSION}" > $serverPath/keepalived/version.pl
 		echo 'keepalived安装完成'
@@ -58,6 +62,10 @@ Install_App()
 		cd ${rootPath} && python3 ${rootPath}/plugins/keepalived/index.py start
 		cd ${rootPath} && python3 ${rootPath}/plugins/keepalived/index.py initd_install
 	fi
+
+	if [ -d $serverPath/source/keepalived/keepalived-${VERSION} ];then
+		rm -rf $serverPath/source/keepalived/keepalived-${VERSION}
+	fi
 }
 
 Uninstall_App()
diff --git a/plugins/keepalived/scripts/chk_mysql.sh b/plugins/keepalived/scripts/chk_mysql.sh
index 3002e57bc..33d9e7429 100644
--- a/plugins/keepalived/scripts/chk_mysql.sh
+++ b/plugins/keepalived/scripts/chk_mysql.sh
@@ -1,5 +1,12 @@
 #!/bin/bash
+
+date +'%Y-%m-%d %H:%M:%S'
+echo "start check mysql status ..."
 counter=$(netstat -na|grep "LISTEN"|grep "3306"|wc -l)
 if [ "${counter}" -eq 0 ]; then
+    echo "check mysql is down, stop keepalive" 
     systemctl stop keepalived
-fi
\ No newline at end of file
+fi
+
+echo "start check mysql end"
+date +'%Y-%m-%d %H:%M:%S'
\ No newline at end of file