diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-25 14:22:50 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-25 14:22:50 +0200 |
| commit | c7e8282b9eb9d6452f7678c3f7c1e06337a3bb0a (patch) | |
| tree | 367dd15b293a18e9944aae02e547551674293930 /tests/imtcp-multiport.sh | |
| parent | 5fd2bcce232352f3abbe235c788b9a8fa7bac043 (diff) | |
| parent | b9549380270fa68e27e8ee3f049c7d34156a85ff (diff) | |
| download | rsyslog-c7e8282b9eb9d6452f7678c3f7c1e06337a3bb0a.tar.gz rsyslog-c7e8282b9eb9d6452f7678c3f7c1e06337a3bb0a.tar.bz2 rsyslog-c7e8282b9eb9d6452f7678c3f7c1e06337a3bb0a.zip | |
Merge branch 'master' into ultra-reliable
Diffstat (limited to 'tests/imtcp-multiport.sh')
| -rwxr-xr-x | tests/imtcp-multiport.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/imtcp-multiport.sh b/tests/imtcp-multiport.sh index aa1f15e8..17480dae 100755 --- a/tests/imtcp-multiport.sh +++ b/tests/imtcp-multiport.sh @@ -17,7 +17,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 2 # 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 @@ -42,7 +42,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 2 # 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 @@ -67,7 +67,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 2 # 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 |