diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-31 16:30:13 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-31 16:30:13 +0200 |
| commit | 945bc9bd0d9de984ab11b9faf609b809a1f3cb90 (patch) | |
| tree | f3464946b2eef29b2f8a4e54c32f7bf063a2c27f /tests/diag.sh | |
| parent | f057fb2db388cc16475f9c5a7de64aeb1f3bdb43 (diff) | |
| parent | eccfbf71f9dbc235309c2ad40035d41620f5e5df (diff) | |
| download | rsyslog-945bc9bd0d9de984ab11b9faf609b809a1f3cb90.tar.gz rsyslog-945bc9bd0d9de984ab11b9faf609b809a1f3cb90.tar.xz rsyslog-945bc9bd0d9de984ab11b9faf609b809a1f3cb90.zip | |
Merge branch 'v5-beta' into v5-devel
Conflicts:
ChangeLog
Diffstat (limited to 'tests/diag.sh')
| -rwxr-xr-x | tests/diag.sh | 14 |
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! |