incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yas...@apache.org
Subject [5/5] git commit: Redundant router: Fix wrong log attend to keepalived.log
Date Fri, 21 Dec 2012 23:29:45 GMT
Redundant router: Fix wrong log attend to keepalived.log

If something got wrong with passwd_server_ip script, it would output to
keepalived.log, thus cause other scripts malfunctional.

Also make savepassword.sh using the same lock as serve_password.sh.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7926e66a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7926e66a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7926e66a

Branch: refs/heads/master
Commit: 7926e66afae2fd1dbd1555fc5fba5688bd6e1ea6
Parents: 503a5f2
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Fri Oct 26 16:25:15 2012 -0700
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Fri Dec 21 15:21:49 2012 -0800

----------------------------------------------------------------------
 .../debian/config/opt/cloud/bin/passwd_server      |    2 +-
 .../systemvm/debian/config/root/savepassword.sh    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7926e66a/patches/systemvm/debian/config/opt/cloud/bin/passwd_server
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/passwd_server b/patches/systemvm/debian/config/opt/cloud/bin/passwd_server
index 71349dd..0f4a772 100755
--- a/patches/systemvm/debian/config/opt/cloud/bin/passwd_server
+++ b/patches/systemvm/debian/config/opt/cloud/bin/passwd_server
@@ -19,5 +19,5 @@
 ips=$(ip addr show dev eth0 | grep inet | grep eth0 | awk '{print $2}' ); echo $ips
 for ip in $ips; do
 	addr=$(echo $ip | awk -F'/' '{print $1}')
-	/opt/cloud/bin/passwd_server_ip $addr &
+	/opt/cloud/bin/passwd_server_ip $addr >> /var/log/cloud.log 2>&1 &
 done;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7926e66a/patches/systemvm/debian/config/root/savepassword.sh
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/root/savepassword.sh b/patches/systemvm/debian/config/root/savepassword.sh
index 80a6928..a096b86 100755
--- a/patches/systemvm/debian/config/root/savepassword.sh
+++ b/patches/systemvm/debian/config/root/savepassword.sh
@@ -24,7 +24,7 @@
 
 source /root/func.sh
 
-lock="biglock"
+lock="passwdlock"
 locked=$(getLockFile $lock)
 if [ "$locked" != "1" ]
 then


Mime
View raw message