diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-25 15:41:45 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-25 15:41:45 +0200 |
| commit | de51fab0ff9647954fe6540ee77252e9ea317888 (patch) | |
| tree | 09682f3e09c7d3768b9c66979a4d78796f59e5f4 /tests/testsuites | |
| parent | c7e8282b9eb9d6452f7678c3f7c1e06337a3bb0a (diff) | |
| parent | 78bc40e1af312d076c4cc2225c9281b6725217f6 (diff) | |
| download | rsyslog-de51fab0ff9647954fe6540ee77252e9ea317888.tar.gz rsyslog-de51fab0ff9647954fe6540ee77252e9ea317888.tar.xz rsyslog-de51fab0ff9647954fe6540ee77252e9ea317888.zip | |
Merge branch 'master' into ultra-reliable
Conflicts:
tests/Makefile.am
Diffstat (limited to 'tests/testsuites')
| -rw-r--r-- | tests/testsuites/memq-persist1.conf | 25 | ||||
| -rw-r--r-- | tests/testsuites/memq-persist2.conf | 20 |
2 files changed, 45 insertions, 0 deletions
diff --git a/tests/testsuites/memq-persist1.conf b/tests/testsuites/memq-persist1.conf new file mode 100644 index 00000000..5240090f --- /dev/null +++ b/tests/testsuites/memq-persist1.conf @@ -0,0 +1,25 @@ +# Test for persisting messages to disk on shutdown +# rgerhards, 2009-04-17 +$ModLoad ../plugins/imtcp/.libs/imtcp +$MainMsgQueueTimeoutShutdown 1 +$MainMsgQueueSaveOnShutdown on +$InputTCPServerRun 13514 + +$ModLoad ../plugins/imdiag/.libs/imdiag +$IMDiagServerRun 13500 + +$ModLoad ../plugins/omtesting/.libs/omtesting + +$ErrorMessagesToStderr off + +# set spool locations and switch queue to disk-only mode +$WorkDirectory test-spool +$MainMsgQueueFilename mainq +$MainMsgQueueType LinkedList + +$template outfmt,"%msg:F,58:2%\n" +$template dynfile,"rsyslog.out.log" # trick to use relative path names! +:msg, contains, "msgnum:" ?dynfile;outfmt + +# delay execution so that a queue can build up: +*.* :omtesting:sleep 0 1000 diff --git a/tests/testsuites/memq-persist2.conf b/tests/testsuites/memq-persist2.conf new file mode 100644 index 00000000..23e29e2f --- /dev/null +++ b/tests/testsuites/memq-persist2.conf @@ -0,0 +1,20 @@ +# Test for persisting messages to disk on shutdown +# rgerhards, 2009-04-17 +$ModLoad ../plugins/imtcp/.libs/imtcp +$MainMsgQueueTimeoutShutdown 10000 +$MainMsgQueueSaveOnShutdown on +$InputTCPServerRun 13514 + +$ModLoad ../plugins/imdiag/.libs/imdiag +$IMDiagServerRun 13500 + +$ErrorMessagesToStderr off + +# set spool locations and switch queue to disk-only mode +$WorkDirectory test-spool +$MainMsgQueueFilename mainq +$MainMsgQueueType LinkedList + +$template outfmt,"%msg:F,58:2%\n" +$template dynfile,"rsyslog.out.log" # trick to use relative path names! +:msg, contains, "msgnum:" ?dynfile;outfmt |