diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-08 18:45:22 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-08 18:45:22 +0100 |
| commit | d50f1e711ffd479d1ddbc89342e9b28b8b9abba9 (patch) | |
| tree | 8364adc48f18f3fafb66990a0ed6a55e66a16da5 /tests/imtcp_conndrop.sh | |
| parent | f813c01258ec5ef3adc8f4790c5c743c2f4b462a (diff) | |
| parent | 3866bd51bf7e622594ff4831664c28d80f711cb3 (diff) | |
| download | rsyslog-d50f1e711ffd479d1ddbc89342e9b28b8b9abba9.tar.gz rsyslog-d50f1e711ffd479d1ddbc89342e9b28b8b9abba9.tar.bz2 rsyslog-d50f1e711ffd479d1ddbc89342e9b28b8b9abba9.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
ChangeLog
tests/Makefile.am
tools/syslogd.c
Diffstat (limited to 'tests/imtcp_conndrop.sh')
| -rwxr-xr-x | tests/imtcp_conndrop.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/imtcp_conndrop.sh b/tests/imtcp_conndrop.sh index 2caa0ce2..9855ee3b 100755 --- a/tests/imtcp_conndrop.sh +++ b/tests/imtcp_conndrop.sh @@ -6,7 +6,7 @@ echo =========================================================================== echo TEST: \[imtcp_conndrop.sh\]: test imtcp with random connection drops cat rsyslog.action.1.include source $srcdir/diag.sh init -source $srcdir/diag.sh startup imptcp_large.conf +source $srcdir/diag.sh startup imtcp_conndrop.conf # 100 byte messages to gain more practical data use source $srcdir/diag.sh tcpflood -c20 -m50000 -r -d100 -P129 -D sleep 4 # due to large messages, we need this time for the tcp receiver to settle... |