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/testsuites | |
| parent | e89ae2e7b18ba935d7eea4c44f3ec15ff6dcfb31 (diff) | |
| parent | eb1615068c6a704287eda732d287280df4cc4c44 (diff) | |
| download | rsyslog-fc0712f40ae63aa54080683c7ee5ae52055c009d.tar.gz rsyslog-fc0712f40ae63aa54080683c7ee5ae52055c009d.tar.xz rsyslog-fc0712f40ae63aa54080683c7ee5ae52055c009d.zip | |
Merge branch 'master' into ultra-reliable
Conflicts:
tests/Makefile.am
tests/diskqueue.sh
Diffstat (limited to 'tests/testsuites')
| -rw-r--r-- | tests/testsuites/diskqueue.conf | 3 | ||||
| -rw-r--r-- | tests/testsuites/manytcp.conf | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/testsuites/diskqueue.conf b/tests/testsuites/diskqueue.conf index 8851a459..017ee96d 100644 --- a/tests/testsuites/diskqueue.conf +++ b/tests/testsuites/diskqueue.conf @@ -4,6 +4,9 @@ $ModLoad ../plugins/imtcp/.libs/imtcp $MainMsgQueueTimeoutShutdown 10000 $InputTCPServerRun 13514 +$ModLoad ../plugins/imdiag/.libs/imdiag +$IMDiagServerRun 13500 + $ErrorMessagesToStderr off # set spool locations and switch queue to disk-only mode diff --git a/tests/testsuites/manytcp.conf b/tests/testsuites/manytcp.conf index 8175732e..3867da46 100644 --- a/tests/testsuites/manytcp.conf +++ b/tests/testsuites/manytcp.conf @@ -6,6 +6,9 @@ $MaxOpenFiles 2000 $InputTCPMaxSessions 1100 $InputTCPServerRun 13514 +$ModLoad ../plugins/imdiag/.libs/imdiag +$IMDiagServerRun 13500 + $ErrorMessagesToStderr off $template outfmt,"%msg:F,58:2%\n" |