diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-05 14:34:08 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-05 14:34:08 +0100 |
| commit | cd5f653ad8fa87727bf3ab12b90a41babaaf1ee5 (patch) | |
| tree | 4e98efffdf24157afe8601a8c381dcc56a0ad354 /tests/testsuites | |
| parent | e4ca8a3119ece504819605b340a3f5ba36b3eab6 (diff) | |
| parent | 6a99be469643ef0214729391f9cef4867b8e9fca (diff) | |
| download | rsyslog-cd5f653ad8fa87727bf3ab12b90a41babaaf1ee5.tar.gz rsyslog-cd5f653ad8fa87727bf3ab12b90a41babaaf1ee5.tar.xz rsyslog-cd5f653ad8fa87727bf3ab12b90a41babaaf1ee5.zip | |
Merge branch 'v4-beta' into v4-devel
Conflicts:
tests/Makefile.am
Diffstat (limited to 'tests/testsuites')
| -rw-r--r-- | tests/testsuites/pipeaction.conf | 16 | ||||
| -rw-r--r-- | tests/testsuites/threadingmq.conf | 6 | ||||
| -rw-r--r-- | tests/testsuites/threadingmqaq.conf | 4 |
3 files changed, 17 insertions, 9 deletions
diff --git a/tests/testsuites/pipeaction.conf b/tests/testsuites/pipeaction.conf new file mode 100644 index 00000000..f58b6d65 --- /dev/null +++ b/tests/testsuites/pipeaction.conf @@ -0,0 +1,16 @@ +# Test for pipe output action (see .sh file for details) +# rgerhards, 2009-11-05 +$IncludeConfig diag-common.conf + +$MainMsgQueueTimeoutShutdown 10000 + +# set spool locations and switch queue to disk-only mode +$WorkDirectory test-spool +$MainMsgQueueFilename mainq +$MainMsgQueueType disk + +$template outfmt,"%msg:F,58:2%\n" +# with pipes, we do not need to use absolute path names, so +# we can simply refer to our working pipe via the usual relative +# path name +:msg, contains, "msgnum:" |rsyslog-testbench-fifo;outfmt diff --git a/tests/testsuites/threadingmq.conf b/tests/testsuites/threadingmq.conf index aa5197bb..b98f9b5a 100644 --- a/tests/testsuites/threadingmq.conf +++ b/tests/testsuites/threadingmq.conf @@ -3,11 +3,7 @@ # rgerhards, 2009-06-26 $IncludeConfig diag-common.conf -$ModLoad ../plugins/imtcp/.libs/imtcp -$MainMsgQueueTimeoutShutdown 10000 -$MaxOpenFiles 2000 -$InputTCPMaxSessions 1100 -$InputTCPServerRun 13514 +$MainMsgQueueTimeoutShutdown 100000 $MainMsgQueueWorkerThreadMinimumMessages 10 $MainMsgQueueWorkerThreads 5 diff --git a/tests/testsuites/threadingmqaq.conf b/tests/testsuites/threadingmqaq.conf index f1bb72df..f0d39057 100644 --- a/tests/testsuites/threadingmqaq.conf +++ b/tests/testsuites/threadingmqaq.conf @@ -3,11 +3,7 @@ # rgerhards, 2009-06-26 $IncludeConfig diag-common.conf -$ModLoad ../plugins/imtcp/.libs/imtcp $MainMsgQueueTimeoutShutdown 10000 -$MaxOpenFiles 2000 -$InputTCPMaxSessions 1100 -$InputTCPServerRun 13514 $MainMsgQueueWorkerThreadMinimumMessages 10 $MainMsgQueueWorkerThreads 5 |