diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-25 11:05:18 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-25 11:05:18 +0200 |
| commit | fc0712f40ae63aa54080683c7ee5ae52055c009d (patch) | |
| tree | b236e751acbe262a1f334221d523a2f121a3edff /tests/diskqueue.sh | |
| parent | e89ae2e7b18ba935d7eea4c44f3ec15ff6dcfb31 (diff) | |
| parent | eb1615068c6a704287eda732d287280df4cc4c44 (diff) | |
| download | rsyslog-fc0712f40ae63aa54080683c7ee5ae52055c009d.tar.gz rsyslog-fc0712f40ae63aa54080683c7ee5ae52055c009d.tar.bz2 rsyslog-fc0712f40ae63aa54080683c7ee5ae52055c009d.zip | |
Merge branch 'master' into ultra-reliable
Conflicts:
tests/Makefile.am
tests/diskqueue.sh
Diffstat (limited to 'tests/diskqueue.sh')
| -rwxr-xr-x | tests/diskqueue.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/diskqueue.sh b/tests/diskqueue.sh index efa6728b..8441cbf2 100755 --- a/tests/diskqueue.sh +++ b/tests/diskqueue.sh @@ -18,7 +18,7 @@ if [ "$?" -ne "0" ]; then echo "error during tcpflood! see rsyslog.out.log.save for what was written" cp rsyslog.out.log rsyslog.out.log.save fi -sleep 6 # we need this so that rsyslogd can receive all outstanding messages +$srcdir/waitqueueempty.sh # wait until rsyslogd is done processing messages kill `cat rsyslog.pid` rm -f work sort < rsyslog.out.log > work |