@@ -12,12 +12,7 @@ mkdir -p $LOG_DIR
12
12
13
13
exec 3>&1
14
14
15
- function prepend_rfc3339_datetime() {
16
- perl -ne ' BEGIN { use Time::HiRes "time"; use POSIX "strftime"; STDOUT->autoflush(1) }; my $t = time; my $fsec = sprintf ".%09d", ($t-int($t))*1000000000; my $time = strftime("[%Y-%m-%dT%H:%M:%S".$fsec."Z]", localtime $t); print("$time $_")'
17
- }
18
-
19
- exec 1> prepend_rfc3339_datetime >> $LOGFILE
20
- exec 2> prepend_rfc3339_datetime >> $LOGFILE
15
+ exec & > >( while read line; do echo " [$( date +%Y-%m-%dT%H:%M:%S.%NZ) ] $line " >> ${LOGFILE} ; done ; )
21
16
22
17
evacuate () {
23
18
curl --fail --max-time 600 http://$ADDRESS /evacuate > /dev/null 2>&1
@@ -30,7 +25,7 @@ heartbeat() {
30
25
wait_for_apps_to_be_evacuated () {
31
26
for i in {1..90}; do
32
27
if pgrep -x " rep" > /dev/null; then
33
- echo " $( date ) : waiting for rep..."
28
+ echo " waiting for rep..."
34
29
sleep 10
35
30
else
36
31
break
@@ -46,9 +41,9 @@ output_for_bosh() {
46
41
exit_code=$?
47
42
48
43
if [ $exit_code -eq 0 ]; then
49
- echo " $( date ) : nfsv3driver exited"
44
+ echo " nfsv3driver exited"
50
45
else
51
- echo " $( date ) : evacuation failed"
46
+ echo " evacuation failed"
52
47
fi
53
48
54
49
# See https://www.pivotaltracker.com/story/show/165747144/comments/202416034
@@ -58,20 +53,20 @@ output_for_bosh() {
58
53
trap output_for_bosh EXIT
59
54
60
55
if [ ! -f $PIDFILE ]; then
61
- echo " $( date ) : PIDFILE does not exist"
56
+ echo " PIDFILE does not exist"
62
57
exit 0
63
58
fi
64
59
65
60
pid=$( cat $PIDFILE )
66
61
67
62
if [ ! -e /proc/$pid ]; then
68
- echo " $( date ) : nfsv3driver process not running"
63
+ echo " nfsv3driver process not running"
69
64
exit 0
70
65
fi
71
66
72
67
wait_for_apps_to_be_evacuated
73
68
74
- echo " $( date ) : rep is done..evacuating nfsv3driver"
69
+ echo " rep is done..evacuating nfsv3driver"
75
70
76
71
set +e
77
72
evacuate
81
76
if [ $evacuate_exit_code -eq 0 ]; then
82
77
for i in {1..60}; do
83
78
if heartbeat; then
84
- echo " $( date ) : waiting"
79
+ echo " waiting"
85
80
sleep 5
86
81
else
87
82
break
@@ -91,7 +86,7 @@ if [ $evacuate_exit_code -eq 0 ]; then
91
86
kill -9 $pid || true
92
87
rm -rf $PIDFILE || true
93
88
elif [ $evacuate_exit_code -eq 28 ]; then
94
- echo " $( date ) : Drain timed out"
89
+ echo " Drain timed out"
95
90
kill -9 $pid || true
96
91
rm -rf $PIDFILE || true
97
92
else
0 commit comments