diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-20 12:58:48 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-20 12:58:48 +0200 |
| commit | 0f52727043736b1e411bc60309ed18d41a4f1234 (patch) | |
| tree | 97fd6c1defe93abc97717c4ae3d598166f7ad402 /tests/testsuites | |
| parent | 7c1ad1c77cc3884931bd2c9e2d2f45db892a15a0 (diff) | |
| parent | 4a24d8e1b63a27d8c20f2d3d614fcdc2bcb52a01 (diff) | |
| download | rsyslog-0f52727043736b1e411bc60309ed18d41a4f1234.tar.gz rsyslog-0f52727043736b1e411bc60309ed18d41a4f1234.tar.xz rsyslog-0f52727043736b1e411bc60309ed18d41a4f1234.zip | |
Merge branch 'beta' into v6-stable
Diffstat (limited to 'tests/testsuites')
| -rw-r--r-- | tests/testsuites/imfile-basic.conf | 1 | ||||
| -rw-r--r-- | tests/testsuites/imtcp_conndrop.conf | 1 | ||||
| -rw-r--r-- | tests/testsuites/mysql-basic-cnf6.conf | 7 |
3 files changed, 8 insertions, 1 deletions
diff --git a/tests/testsuites/imfile-basic.conf b/tests/testsuites/imfile-basic.conf index 9fb9b5ca..59b109a6 100644 --- a/tests/testsuites/imfile-basic.conf +++ b/tests/testsuites/imfile-basic.conf @@ -6,6 +6,7 @@ $InputFileTag file: $InputFileStateFile stat-file1 $InputFileSeverity error $InputFileFacility local7 +$InputFileMaxLinesAtOnce 100000 $InputRunFileMonitor $template outfmt,"%msg:F,58:2%\n" diff --git a/tests/testsuites/imtcp_conndrop.conf b/tests/testsuites/imtcp_conndrop.conf index b64f132b..de41bc43 100644 --- a/tests/testsuites/imtcp_conndrop.conf +++ b/tests/testsuites/imtcp_conndrop.conf @@ -12,5 +12,4 @@ $template dynfile,"rsyslog.out.log" # trick to use relative path names! $OMFileFlushOnTXEnd off $OMFileFlushInterval 2 $OMFileIOBufferSize 256k -$IncludeConfig rsyslog.action.1.include local0.* ?dynfile;outfmt diff --git a/tests/testsuites/mysql-basic-cnf6.conf b/tests/testsuites/mysql-basic-cnf6.conf new file mode 100644 index 00000000..12bd0b29 --- /dev/null +++ b/tests/testsuites/mysql-basic-cnf6.conf @@ -0,0 +1,7 @@ +$IncludeConfig diag-common.conf + +$ModLoad ../plugins/ommysql/.libs/ommysql +if $msg contains 'msgnum' then { + action(type="ommysql" server="127.0.0.1" + db="Syslog" uid="rsyslog" pwd="testbench") +} |