CLOUDSTACK-4601: Add PATH for cron job of check_heartbeat.sh

Sheng Yang · Sheng Yang · commit 495259132cef · 2013-09-03T16:55:27.000-07:00
Also fix a typo in the script template.
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -847,7 +847,7 @@ setup_redundant_router() {
     crontab -l|grep "check_heartbeat.sh"
     if [ $? -ne 0 ]
     then
-        (crontab -l; echo "*/1 * * * * $rrouter_bin_path/check_heartbeat.sh 2>&1 > /dev/null") | crontab
+        (crontab -l; echo -e "SHELL=/bin/bash\nPATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\n*/1 * * * * $rrouter_bin_path/check_heartbeat.sh 2>&1 > /dev/null") | crontab
     fi
 }
 
diff --git a/patches/systemvm/debian/config/root/redundant_router/check_heartbeat.sh.templ b/patches/systemvm/debian/config/root/redundant_router/check_heartbeat.sh.templ
@@ -22,7 +22,7 @@ then
     lasttime=$(cat [RROUTER_BIN_PATH]/keepalived.ts2)
     thistime=$(cat [RROUTER_BIN_PATH]/keepalived.ts)
     diff=$(($thistime - $lasttime))
-    if [ $diff -lt 30]
+    if [ $diff -lt 30 ]
     then
         echo Keepalived process is dead! >> [RROUTER_LOG]
         service keepalived stop >> [RROUTER_LOG] 2>&1

Original file line number	Diff line number	Diff line change
`@@ -847,7 +847,7 @@ setup_redundant_router() {`
`847`	`847`	`crontab -l\|grep "check_heartbeat.sh"`
`848`	`848`	`if [ $? -ne 0 ]`
`849`	`849`	`then`
`850`		`- (crontab -l; echo "/1 * * * $rrouter_bin_path/check_heartbeat.sh 2>&1 > /dev/null") \| crontab`
	`850`	`+ (crontab -l; echo -e "SHELL=/bin/bash\nPATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\n/1 * * * $rrouter_bin_path/check_heartbeat.sh 2>&1 > /dev/null") \| crontab`
`851`	`851`	`fi`
`852`	`852`	`}`
`853`	`853`