| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | $MaxMessageSize doesn't work if before $IncludeConfig diag-common.conf, then |
| 2 | test cases fall into infinite loop with error message: |
| 3 | |
| 4 | 8062.511110729:4902c480: error: message received is larger than max msg size, we split it |
| 5 | 8062.511152265:4902c480: discarding zero-sized message |
| 6 | |
| 7 | Update configure to fix it. |
| 8 | |
| 9 | Upstream-Status: pending |
| 10 | |
| 11 | Kai Kang <kai.kang@windriver.com> |
| 12 | --- |
| 13 | diff -Nru rsyslog-7.4.4/tests/testsuites/complex1.conf rsyslog-7.4.4.new/tests/testsuites/complex1.conf |
| 14 | --- rsyslog-7.4.4/tests/testsuites/complex1.conf 2013-08-31 00:30:41.000000000 +0800 |
| 15 | +++ rsyslog-7.4.4.new/tests/testsuites/complex1.conf 2013-12-18 14:28:10.644004184 +0800 |
| 16 | @@ -1,7 +1,7 @@ |
| 17 | # complex test case with multiple actions in gzip mode |
| 18 | # rgerhards, 2009-05-22 |
| 19 | -$MaxMessageSize 10k |
| 20 | $IncludeConfig diag-common.conf |
| 21 | +$MaxMessageSize 10k |
| 22 | |
| 23 | $MainMsgQueueTimeoutEnqueue 5000 |
| 24 | |
| 25 | diff -Nru rsyslog-7.4.4/tests/testsuites/gzipwr_large.conf rsyslog-7.4.4.new/tests/testsuites/gzipwr_large.conf |
| 26 | --- rsyslog-7.4.4/tests/testsuites/gzipwr_large.conf 2012-04-04 14:29:55.000000000 +0800 |
| 27 | +++ rsyslog-7.4.4.new/tests/testsuites/gzipwr_large.conf 2013-12-18 14:28:10.645004186 +0800 |
| 28 | @@ -1,7 +1,7 @@ |
| 29 | # simple async writing test |
| 30 | # rgerhards, 2010-03-09 |
| 31 | -$MaxMessageSize 10k |
| 32 | $IncludeConfig diag-common.conf |
| 33 | +$MaxMessageSize 10k |
| 34 | |
| 35 | $ModLoad ../plugins/imtcp/.libs/imtcp |
| 36 | $MainMsgQueueTimeoutShutdown 10000 |
| 37 | diff -Nru rsyslog-7.4.4/tests/testsuites/gzipwr_large_dynfile.conf rsyslog-7.4.4.new/tests/testsuites/gzipwr_large_dynfile.conf |
| 38 | --- rsyslog-7.4.4/tests/testsuites/gzipwr_large_dynfile.conf 2012-04-04 14:29:55.000000000 +0800 |
| 39 | +++ rsyslog-7.4.4.new/tests/testsuites/gzipwr_large_dynfile.conf 2013-12-18 14:28:10.645004186 +0800 |
| 40 | @@ -1,7 +1,7 @@ |
| 41 | # simple async writing test |
| 42 | # rgerhards, 2010-03-09 |
| 43 | -$MaxMessageSize 10k |
| 44 | $IncludeConfig diag-common.conf |
| 45 | +$MaxMessageSize 10k |
| 46 | |
| 47 | $ModLoad ../plugins/imtcp/.libs/imtcp |
| 48 | $MainMsgQueueTimeoutShutdown 10000 |
| 49 | diff -Nru rsyslog-7.4.4/tests/testsuites/imptcp_conndrop.conf rsyslog-7.4.4.new/tests/testsuites/imptcp_conndrop.conf |
| 50 | --- rsyslog-7.4.4/tests/testsuites/imptcp_conndrop.conf 2013-08-31 00:30:41.000000000 +0800 |
| 51 | +++ rsyslog-7.4.4.new/tests/testsuites/imptcp_conndrop.conf 2013-12-18 14:28:10.646004189 +0800 |
| 52 | @@ -1,7 +1,7 @@ |
| 53 | # simple async writing test |
| 54 | # rgerhards, 2010-03-09 |
| 55 | -$MaxMessageSize 10k |
| 56 | $IncludeConfig diag-common.conf |
| 57 | +$MaxMessageSize 10k |
| 58 | |
| 59 | $ModLoad ../plugins/imptcp/.libs/imptcp |
| 60 | $MainMsgQueueTimeoutShutdown 10000 |
| 61 | diff -Nru rsyslog-7.4.4/tests/testsuites/imptcp_large.conf rsyslog-7.4.4.new/tests/testsuites/imptcp_large.conf |
| 62 | --- rsyslog-7.4.4/tests/testsuites/imptcp_large.conf 2013-08-31 00:30:41.000000000 +0800 |
| 63 | +++ rsyslog-7.4.4.new/tests/testsuites/imptcp_large.conf 2013-12-18 14:28:10.646004189 +0800 |
| 64 | @@ -1,7 +1,7 @@ |
| 65 | # simple async writing test |
| 66 | # rgerhards, 2010-03-09 |
| 67 | -$MaxMessageSize 10k |
| 68 | $IncludeConfig diag-common.conf |
| 69 | +$MaxMessageSize 10k |
| 70 | |
| 71 | $ModLoad ../plugins/imptcp/.libs/imptcp |
| 72 | $MainMsgQueueTimeoutShutdown 10000 |
| 73 | diff -Nru rsyslog-7.4.4/tests/testsuites/imtcp_conndrop.conf rsyslog-7.4.4.new/tests/testsuites/imtcp_conndrop.conf |
| 74 | --- rsyslog-7.4.4/tests/testsuites/imtcp_conndrop.conf 2013-07-19 20:59:03.000000000 +0800 |
| 75 | +++ rsyslog-7.4.4.new/tests/testsuites/imtcp_conndrop.conf 2013-12-18 14:28:10.646004189 +0800 |
| 76 | @@ -1,7 +1,7 @@ |
| 77 | # simple async writing test |
| 78 | # rgerhards, 2010-03-09 |
| 79 | -$MaxMessageSize 10k |
| 80 | $IncludeConfig diag-common.conf |
| 81 | +$MaxMessageSize 10k |
| 82 | |
| 83 | $ModLoad ../plugins/imtcp/.libs/imtcp |
| 84 | $MainMsgQueueTimeoutShutdown 10000 |
| 85 | diff -Nru rsyslog-7.4.4/tests/testsuites/wr_large.conf rsyslog-7.4.4.new/tests/testsuites/wr_large.conf |
| 86 | --- rsyslog-7.4.4/tests/testsuites/wr_large.conf 2012-04-04 14:29:55.000000000 +0800 |
| 87 | +++ rsyslog-7.4.4.new/tests/testsuites/wr_large.conf 2013-12-18 14:28:10.647004190 +0800 |
| 88 | @@ -1,7 +1,7 @@ |
| 89 | # simple async writing test |
| 90 | # rgerhards, 2010-03-09 |
| 91 | -$MaxMessageSize 10k |
| 92 | $IncludeConfig diag-common.conf |
| 93 | +$MaxMessageSize 10k |
| 94 | |
| 95 | $ModLoad ../plugins/imtcp/.libs/imtcp |
| 96 | $MainMsgQueueTimeoutShutdown 10000 |