diff options
Diffstat (limited to 'qpid/cpp/src/tests/dynamic_log_level_test')
| -rwxr-xr-x | qpid/cpp/src/tests/dynamic_log_level_test | 49 |
1 files changed, 41 insertions, 8 deletions
diff --git a/qpid/cpp/src/tests/dynamic_log_level_test b/qpid/cpp/src/tests/dynamic_log_level_test index 534110e352..7548e40683 100755 --- a/qpid/cpp/src/tests/dynamic_log_level_test +++ b/qpid/cpp/src/tests/dynamic_log_level_test @@ -35,23 +35,56 @@ error() { exit 1; } +checklog() { + if [[ $(grep echo $LOG_FILE | wc -l) -ne $1 ]]; then + cat $LOG_FILE + error "Log contents not as expected - " $2 + fi +} + rm -rf $LOG_FILE PORT=$($QPIDD_EXEC --auth=no --no-module-dir --daemon --port=0 --log-to-file $LOG_FILE) || error "Could not start broker" echo Broker for log level test started on $PORT, pid is $($QPIDD_EXEC --no-module-dir --check --port $PORT) +# Set level to notice+ and send an echo request +# The 'echo' in the log is hidden since it is at debug level. $srcdir/qpid-ctrl -b localhost:$PORT setLogLevel level='notice+' > /dev/null $srcdir/qpid-ctrl -b localhost:$PORT echo sequence=1 body=HIDDEN > /dev/null +checklog 0 "Step 1 Expected no echo log entries" + +# Next, enable all Broker logs at debug and higher levels and send another echo +# This 'echo' should be in the log. $srcdir/qpid-ctrl -b localhost:$PORT setLogLevel level='debug+:Broker' > /dev/null $srcdir/qpid-ctrl -b localhost:$PORT echo sequence=2 body=VISIBLE > /dev/null -$srcdir/qpid-ctrl -b localhost:$PORT setLogLevel level='notice+' > /dev/null +checklog 1 "Step 2 Expected one echo log entry" -#check log includes debug statement for last echo, but not the first -if [[ $(grep echo $LOG_FILE | wc -l) -ne 1 ]]; then - cat $LOG_FILE - error "Log contents not as expected" -else - rm -rf $LOG_FILE - echo OK +# Now turn on Broker debug messages but specifically disable ManagementMethod logs +# The 'echo' should be hidden. +$srcdir/qpid-ctrl -b localhost:$PORT setLogLevel level='debug+:Broker !debug+:broker::Broker::ManagementMethod' > /dev/null +$srcdir/qpid-ctrl -b localhost:$PORT echo sequence=3 body=HIDDEN > /dev/null +checklog 1 "Step 3 Expected one echo log entry" + +# Verify that the management get returns what was just set +$srcdir/qpid-ctrl -b localhost:$PORT getLogLevel > dynamic_log_level.tmp +if [[ $(grep 'level=debug+:Broker,!debug+:broker::Broker::ManagementMethod' dynamic_log_level.tmp | wc -l) -ne 1 ]]; then + error "Step 4 getLogLevel returned unexpected value: " `cat dynamic_log_level.tmp` fi +rm -rf dynamic_log_level.tmp + +cleanup + +# Start another broker with --log-disable settings and make sure the management string receives them +rm -rf $LOG_FILE +PORT=$($QPIDD_EXEC --auth=no --no-module-dir --daemon --port=0 --log-to-file $LOG_FILE --log-enable debug:foo --log-disable debug:bar) || error "Could not start broker" +echo Broker for log level test started on $PORT, pid is $($QPIDD_EXEC --no-module-dir --check --port $PORT) + +$srcdir/qpid-ctrl -b localhost:$PORT getLogLevel > dynamic_log_level.tmp +if [[ $(grep 'level=debug:foo,!debug:bar' dynamic_log_level.tmp | wc -l) -ne 1 ]]; then + error "Step 5 getLogLevel returned unexpected value: " `cat dynamic_log_level.tmp` +fi +rm -rf dynamic_log_level.tmp + +rm -rf $LOG_FILE +echo OK |