@@ -21,55 +21,55 @@ file_env() {
2121}
2222
2323if [ " $1 " = ' pt-heartbeat' ]; then
24- file_env ' PT_DATABASE'
25- if [ -z " $PT_DATABASE " ]; then
26- echo " you have to specify a DB!"
27- exit 1
28- fi
29- file_env ' PT_MASTER'
30- if [ -z " $PT_MASTER " ]; then
31- echo " you have to specify a MySQL Server!"
32- exit 1
33- fi
24+ file_env ' PT_DATABASE'
25+ if [ -z " $PT_DATABASE " ]; then
26+ echo " you have to specify a DB!"
27+ exit 1
28+ fi
29+ file_env ' PT_MASTER'
30+ if [ -z " $PT_MASTER " ]; then
31+ echo " you have to specify a MySQL Server!"
32+ exit 1
33+ fi
3434 file_env ' PT_USER'
35- if [ -z " $PT_USER " ]; then
36- echo " you have to specify a user!"
37- exit 1
38- fi
35+ if [ -z " $PT_USER " ]; then
36+ echo " you have to specify a user!"
37+ exit 1
38+ fi
3939 file_env ' PT_PASSWORD'
40- if [ -z " $PT_PASSWORD " ]; then
41- echo " you have to specify a password!"
42- exit 1
43- fi
44-
45- echo " Waiting for DB init..."
46- sleep 30
40+ if [ -z " $PT_PASSWORD " ]; then
41+ echo " you have to specify a password!"
42+ exit 1
43+ fi
44+
45+ echo " Waiting for DB init..."
46+ sleep 30
4747
48- file_env ' PT_SERVERS'
49- if [ ! -z " $PT_SERVERS " ]; then
50- echo " Waiting MySQL Servers..."
51- SERVERS=($( echo " $PT_SERVERS " | tr ' ,' ' \n' ) )
52- for i in " ${! SERVERS[@]} "
53- do
54- echo " Waiting for ${SERVERS[i]} ..."
55- until mysql --no-defaults -h " ${SERVERS[i]} " -u " $PT_USER " -p" $PT_PASSWORD " " $PT_DATABASE " -nsLNE -e ' exit' ; do
56- >&2 echo " MySQL Master is unavailable - sleeping"
57- sleep 5
58- done
59- done
60- fi
48+ file_env ' PT_SERVERS'
49+ if [ ! -z " $PT_SERVERS " ]; then
50+ echo " Waiting MySQL Servers..."
51+ SERVERS=($( echo " $PT_SERVERS " | tr ' ,' ' \n' ) )
52+ for i in " ${! SERVERS[@]} "
53+ do
54+ echo " Waiting for ${SERVERS[i]} ..."
55+ until mysql --no-defaults -h " ${SERVERS[i]} " -u " $PT_USER " -p" $PT_PASSWORD " " $PT_DATABASE " -nsLNE -e ' exit' ; do
56+ >&2 echo " MySQL Master is unavailable - sleeping"
57+ sleep 5
58+ done
59+ done
60+ fi
6161
62- until mysql --no-defaults -h " $PT_MASTER " -u " $PT_USER " -p" $PT_PASSWORD " " $PT_DATABASE " -nsLNE -e ' exit' ; do
63- >&2 echo " MySQL Master is unavailable - sleeping"
64- sleep 5
65- done
66-
62+ until mysql --no-defaults -h " $PT_MASTER " -u " $PT_USER " -p" $PT_PASSWORD " " $PT_DATABASE " -nsLNE -e ' exit' ; do
63+ >&2 echo " MySQL Master is unavailable - sleeping"
64+ sleep 5
65+ done
66+
6767
68- pt-heartbeat -D $PT_DATABASE --update -h $PT_MASTER --user $PT_USER --password $PT_PASSWORD
69- while [ $? -ne 0 ]; do
70- pt-heartbeat -D $PT_DATABASE --update -h $PT_MASTER --user $PT_USER --password $PT_PASSWORD
71- done
68+ pt-heartbeat -D $PT_DATABASE --update -h $PT_MASTER --user $PT_USER --password $PT_PASSWORD
69+ while [ $? -ne 0 ]; do
70+ pt-heartbeat -D $PT_DATABASE --update -h $PT_MASTER --user $PT_USER --password $PT_PASSWORD
71+ done
7272
7373fi
7474
75- exec " $@ "
75+ exec " $@ "
0 commit comments