Collect df -k instead of df -h. Set log_error with abs path to fix failing t/lib/bash/collect.t test.

This commit is contained in:
Daniel Nichter
2012-08-14 09:11:41 -06:00
parent 676bb28365
commit b5ba79bb6d
6 changed files with 6 additions and 6 deletions

View File

@@ -795,7 +795,7 @@ collect() {
fi fi
fi fi
(echo $ts; df -h) >> "$d/$p-df" & (echo $ts; df -k) >> "$d/$p-df" &
(echo $ts; netstat -antp) >> "$d/$p-netstat" & (echo $ts; netstat -antp) >> "$d/$p-netstat" &
(echo $ts; netstat -s) >> "$d/$p-netstat_s" & (echo $ts; netstat -s) >> "$d/$p-netstat_s" &

View File

@@ -218,7 +218,7 @@ collect() {
fi fi
fi fi
(echo $ts; df -h) >> "$d/$p-df" & (echo $ts; df -k) >> "$d/$p-df" &
(echo $ts; netstat -antp) >> "$d/$p-netstat" & (echo $ts; netstat -antp) >> "$d/$p-netstat" &
(echo $ts; netstat -s) >> "$d/$p-netstat_s" & (echo $ts; netstat -s) >> "$d/$p-netstat_s" &

View File

@@ -22,6 +22,6 @@ log_slave_updates
server-id = PORT server-id = PORT
report-host = 127.0.0.1 report-host = 127.0.0.1
report-port = PORT report-port = PORT
log-error = mysqld.log log-error = /tmp/PORT/data/mysqld.log
innodb_lock_wait_timeout = 3 innodb_lock_wait_timeout = 3
log log

View File

@@ -22,6 +22,6 @@ log_slave_updates
server-id = PORT server-id = PORT
report-host = 127.0.0.1 report-host = 127.0.0.1
report-port = PORT report-port = PORT
log-error = mysqld.log log-error = /tmp/PORT/data/mysqld.log
innodb_lock_wait_timeout = 3 innodb_lock_wait_timeout = 3
log = genlog log = genlog

View File

@@ -22,6 +22,6 @@ log_slave_updates
server-id = PORT server-id = PORT
report-host = 127.0.0.1 report-host = 127.0.0.1
report-port = PORT report-port = PORT
log-error = mysqld.log log-error = /tmp/PORT/data/mysqld.log
innodb_lock_wait_timeout = 3 innodb_lock_wait_timeout = 3
log = genlog log = genlog

View File

@@ -22,7 +22,7 @@ log_slave_updates
server-id = PORT server-id = PORT
report-host = 127.0.0.1 report-host = 127.0.0.1
report-port = PORT report-port = PORT
log-error = mysqld.log log-error = /tmp/PORT/data/mysqld.log
innodb_lock_wait_timeout = 3 innodb_lock_wait_timeout = 3
general_log general_log
general_log_file = genlog general_log_file = genlog