percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-04-17 01:01:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix default log level in log_warn_die.sh.

Browse Source
This commit is contained in:
Daniel Nichter
2013-01-24 11:39:23 -07:00
parent 738359dd10
commit 26cc08d3d9
8 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/pt-ioprofile
View File

@@ -26,15 +26,15 @@ ts() {
} }
info() { info() {
[ ${OPT_VERBOSE:-0} -ge 3 ] && ts "$*" [ ${OPT_VERBOSE:-3} -ge 3 ] && ts "$*"
} }
log() { log() {
[ ${OPT_VERBOSE:-0} -ge 2 ] && ts "$*" [ ${OPT_VERBOSE:-3} -ge 2 ] && ts "$*"
} }
warn() { warn() {
[ ${OPT_VERBOSE:-0} -ge 1 ] && ts "$*" >&2 [ ${OPT_VERBOSE:-3} -ge 1 ] && ts "$*" >&2
EXIT_STATUS=1 EXIT_STATUS=1
} }

6
bin/pt-mysql-summary
View File

@@ -28,15 +28,15 @@ ts() {
} }
info() { info() {
[ ${OPT_VERBOSE:-0} -ge 3 ] && ts "$*" [ ${OPT_VERBOSE:-3} -ge 3 ] && ts "$*"
} }
log() { log() {
[ ${OPT_VERBOSE:-0} -ge 2 ] && ts "$*" [ ${OPT_VERBOSE:-3} -ge 2 ] && ts "$*"
} }
warn() { warn() {
[ ${OPT_VERBOSE:-0} -ge 1 ] && ts "$*" >&2 [ ${OPT_VERBOSE:-3} -ge 1 ] && ts "$*" >&2
EXIT_STATUS=1 EXIT_STATUS=1
} }

6
bin/pt-stalk
View File

@@ -28,15 +28,15 @@ ts() {
} }
info() { info() {
[ ${OPT_VERBOSE:-0} -ge 3 ] && ts "$*" [ ${OPT_VERBOSE:-3} -ge 3 ] && ts "$*"
} }
log() { log() {
[ ${OPT_VERBOSE:-0} -ge 2 ] && ts "$*" [ ${OPT_VERBOSE:-3} -ge 2 ] && ts "$*"
} }
warn() { warn() {
[ ${OPT_VERBOSE:-0} -ge 1 ] && ts "$*" >&2 [ ${OPT_VERBOSE:-3} -ge 1 ] && ts "$*" >&2
EXIT_STATUS=1 EXIT_STATUS=1
} }

6
bin/pt-summary
View File

@@ -35,15 +35,15 @@ ts() {
} }
info() { info() {
[ ${OPT_VERBOSE:-0} -ge 3 ] && ts "$*" [ ${OPT_VERBOSE:-3} -ge 3 ] && ts "$*"
} }
log() { log() {
[ ${OPT_VERBOSE:-0} -ge 2 ] && ts "$*" [ ${OPT_VERBOSE:-3} -ge 2 ] && ts "$*"
} }
warn() { warn() {
[ ${OPT_VERBOSE:-0} -ge 1 ] && ts "$*" >&2 [ ${OPT_VERBOSE:-3} -ge 1 ] && ts "$*" >&2
EXIT_STATUS=1 EXIT_STATUS=1
} }

6
lib/bash/log_warn_die.sh
View File

@@ -34,15 +34,15 @@ ts() {
} }
info() { info() {
[ ${OPT_VERBOSE:-0} -ge 3 ] && ts "$*" [ ${OPT_VERBOSE:-3} -ge 3 ] && ts "$*"
} }
log() { log() {
[ ${OPT_VERBOSE:-0} -ge 2 ] && ts "$*" [ ${OPT_VERBOSE:-3} -ge 2 ] && ts "$*"
} }
warn() { warn() {
[ ${OPT_VERBOSE:-0} -ge 1 ] && ts "$*" >&2 [ ${OPT_VERBOSE:-3} -ge 1 ] && ts "$*" >&2
EXIT_STATUS=1 EXIT_STATUS=1
} }

19
t/lib/bash/log_warn_die.sh
View File

@@ -1,17 +1,15 @@
#!/usr/bin/env bash #!/usr/bin/env bash
plan 6
source "$LIB_DIR/log_warn_die.sh" source "$LIB_DIR/log_warn_die.sh"
log "Hello world!" > $TEST_PT_TMPDIR/log log "Hello world A!" > $TEST_PT_TMPDIR/log
cmd_ok \ cmd_ok \
"grep -q 'Hello world!' $TEST_PT_TMPDIR/log" \ "grep -q 'Hello world A!' $TEST_PT_TMPDIR/log" \
"log msg" "log msg"
log "Hello" "world!" > $TEST_PT_TMPDIR/log log "Hello" "world B!" > $TEST_PT_TMPDIR/log
cmd_ok \ cmd_ok \
"grep -q 'Hello world!' $TEST_PT_TMPDIR/log" \ "grep -q 'Hello world B!' $TEST_PT_TMPDIR/log" \
"log msg msg" "log msg msg"
is \ is \
@@ -19,14 +17,14 @@ is \
"0" \ "0" \
"Exit status 0" "Exit status 0"
warn "Hello world!" 2> $TEST_PT_TMPDIR/log warn "Hello world C!" 2> $TEST_PT_TMPDIR/log
cmd_ok \ cmd_ok \
"grep -q 'Hello world!' $TEST_PT_TMPDIR/log" \ "grep -q 'Hello world C!' $TEST_PT_TMPDIR/log" \
"warn msg" "warn msg"
warn "Hello" "world!" 2> $TEST_PT_TMPDIR/log warn "Hello" "world D!" 2> $TEST_PT_TMPDIR/log
cmd_ok \ cmd_ok \
"grep -q 'Hello world!' $TEST_PT_TMPDIR/log" \ "grep -q 'Hello world D!' $TEST_PT_TMPDIR/log" \
"warn msg msg" "warn msg msg"
is \ is \
@@ -111,3 +109,4 @@ file_is_empty \
# ########################################################################### # ###########################################################################
# Done # Done
# ########################################################################### # ###########################################################################
done_testing

2
t/pt-stalk/option_sanity.t
View File

@@ -17,7 +17,7 @@ my $output = `$trunk/bin/pt-stalk --help`;
like( like(
$output, $output,
qr/^\s+--verbose\s+2/m, qr/^\s+--vebose\s+2/m,
"Default --verbose=2" "Default --verbose=2"
); );

8
util/test-bash-functions
View File

@@ -100,6 +100,7 @@ run_test() {
result() { result() {
local result=$1 local result=$1
local test_name=${2:-""} local test_name=${2:-""}
testno=$((testno + 1))
if [ $result -eq 0 ]; then if [ $result -eq 0 ]; then
echo "ok $testno - $TEST_FILE $test_name" echo "ok $testno - $TEST_FILE $test_name"
else else
@@ -110,7 +111,6 @@ result() {
cat $TEST_PT_TMPDIR/failed_result | sed -e 's/^/# /' -e '30q' >&2 cat $TEST_PT_TMPDIR/failed_result | sed -e 's/^/# /' -e '30q' >&2
fi fi
fi fi
testno=$((testno + 1))
return $result return $result
} }
@@ -121,6 +121,10 @@ plan() {
fi fi
} }
done_testing() {
echo "1..$testno"
}
# #
# The following subs are for the test files to call. # The following subs are for the test files to call.
# #
@@ -260,7 +264,7 @@ diag() {
# Script starts here # Script starts here
# ############################################################################ # ############################################################################
testno=1 testno=0
failed_tests=0 failed_tests=0
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then