diff options
Diffstat (limited to 'qpid/cpp/src/tests/dynamic_log_level_test')
| -rwxr-xr-x | qpid/cpp/src/tests/dynamic_log_level_test | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/qpid/cpp/src/tests/dynamic_log_level_test b/qpid/cpp/src/tests/dynamic_log_level_test index f8fd7a8dd8..0ea40d11b6 100755 --- a/qpid/cpp/src/tests/dynamic_log_level_test +++ b/qpid/cpp/src/tests/dynamic_log_level_test @@ -20,14 +20,14 @@ # # Run a simple test to verify dynamic log level changes -source ./test_env.sh -test -d $PYTHON_DIR || { echo "Skipping python tests, no python dir."; exit 0; } + +source ./env.sh LOG_FILE=log_test.log trap cleanup EXIT cleanup() { - test -n "$PORT" && $QPIDD_EXEC --no-module-dir --quit --port $PORT + test -n "$PORT" && qpidd --no-module-dir --quit --port $PORT } error() { @@ -43,30 +43,30 @@ checklog() { } rm -rf $LOG_FILE -PORT=$($QPIDD_EXEC --auth=no --no-module-dir --daemon --port=0 --interface 127.0.0.1 --log-to-file $LOG_FILE) || error "Could not start broker" +PORT=$(qpidd --auth=no --no-module-dir --daemon --port=0 --interface 127.0.0.1 --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) +echo Broker for log level test started on $PORT, pid is $(qpidd --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 +qpid-ctrl -b localhost:$PORT setLogLevel level='notice+' > /dev/null +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 +qpid-ctrl -b localhost:$PORT setLogLevel level='debug+:Broker' > /dev/null +qpid-ctrl -b localhost:$PORT echo sequence=2 body=VISIBLE > /dev/null checklog 1 "Step 2 Expected one echo log entry" # 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 +qpid-ctrl -b localhost:$PORT setLogLevel level='debug+:Broker !debug+:broker::Broker::ManagementMethod' > /dev/null +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 +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 @@ -76,10 +76,10 @@ 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 --interface 127.0.0.1 --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) +PORT=$(qpidd --auth=no --no-module-dir --daemon --port=0 --interface 127.0.0.1 --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 --no-module-dir --check --port $PORT) -$srcdir/qpid-ctrl -b localhost:$PORT getLogLevel > dynamic_log_level.tmp +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 |