summaryrefslogtreecommitdiffstats
path: root/tests/diag.sh
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-03-30 11:19:22 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-03-30 11:19:22 +0200
commitb59f8fd65d4f464ce3673439725db1606ec31329 (patch)
treec088eff1b782635bd43a061a0e7c340494e10a77 /tests/diag.sh
parent5bfa8d2a254e0ead0608b954bdab6dd2a7d9f3e0 (diff)
downloadrsyslog-b59f8fd65d4f464ce3673439725db1606ec31329.tar.gz
rsyslog-b59f8fd65d4f464ce3673439725db1606ec31329.tar.xz
rsyslog-b59f8fd65d4f464ce3673439725db1606ec31329.zip
fixed problem in testbench & added new test (not yet integrated)
The test is a setup scenario for this bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=241
Diffstat (limited to 'tests/diag.sh')
-rwxr-xr-xtests/diag.sh14
1 files changed, 13 insertions, 1 deletions
diff --git a/tests/diag.sh b/tests/diag.sh
index 8fbe42ed..d1242fb1 100755
--- a/tests/diag.sh
+++ b/tests/diag.sh
@@ -84,15 +84,27 @@ case $1 in
exit 1
fi
;;
+ 'get-mainqueuesize') # show the current main queue size
+ if [ "$2" == "2" ]
+ then
+ echo getmainmsgqueuesize | ./diagtalker -p13501
+ else
+ echo getmainmsgqueuesize | ./diagtalker
+ fi
+ ;;
'wait-queueempty') # wait for main message queue to be empty. $2 is the instance.
if [ "$2" == "2" ]
then
- echo WaitMainQueueEmpty | ./diagtalker
+ echo WaitMainQueueEmpty | ./diagtalker -p13501
else
echo WaitMainQueueEmpty | ./diagtalker
fi
;;
'shutdown-when-empty') # shut rsyslogd down when main queue is empty. $2 is the instance.
+ if [ "$2" == "2" ]
+ then
+ echo Shutting down instance 2
+ fi
$srcdir/diag.sh wait-queueempty $2
kill `cat rsyslog$2.pid`
# note: we do not wait for the actual termination!