diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-23 16:02:42 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-23 16:02:42 +0200 |
| commit | 8159d0a117837ed573e80cf86f4f013bf9534ab2 (patch) | |
| tree | 3c3ef9a4b32a1165d379c71de3abe497b3abc1e2 | |
| parent | 6c5264159c099ddc4d06590508980ee53a83b67b (diff) | |
| download | rsyslog-8159d0a117837ed573e80cf86f4f013bf9534ab2.tar.gz rsyslog-8159d0a117837ed573e80cf86f4f013bf9534ab2.tar.xz rsyslog-8159d0a117837ed573e80cf86f4f013bf9534ab2.zip | |
fixed abort condition in DA mode
| -rw-r--r-- | runtime/queue.c | 3 | ||||
| -rw-r--r-- | runtime/wti.c | 1 | ||||
| -rw-r--r-- | runtime/wtp.c | 2 | ||||
| -rwxr-xr-x | tests/da-mainmsg-q.sh | 1 | ||||
| -rw-r--r-- | tests/testsuites/da-mainmsg-q.conf | 3 |
5 files changed, 2 insertions, 8 deletions
diff --git a/runtime/queue.c b/runtime/queue.c index a5feef3d..c2df928b 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -374,8 +374,7 @@ qqueueInitDA(qqueue_t *pThis, int bEnqOnly, int bLockMutex) CHKiRet(wtpConstruct (&pThis->pWtpDA)); CHKiRet(wtpSetDbgHdr (pThis->pWtpDA, pszBuf, lenBuf)); CHKiRet(wtpSetpfChkStopWrkr (pThis->pWtpDA, (rsRetVal (*)(void *pUsr, int)) qqueueChkStopWrkrDA)); - // MULTIQUEUE: TODO: this should be DA-specific! - CHKiRet(wtpSetpfGetDeqBatchSize (pThis->pWtpReg, (rsRetVal (*)(void *pUsr, int*)) GetDeqBatchSize)); + CHKiRet(wtpSetpfGetDeqBatchSize (pThis->pWtpDA, (rsRetVal (*)(void *pUsr, int*)) GetDeqBatchSize)); CHKiRet(wtpSetpfIsIdle (pThis->pWtpDA, (rsRetVal (*)(void *pUsr, int)) qqueueIsIdleDA)); CHKiRet(wtpSetpfDoWork (pThis->pWtpDA, (rsRetVal (*)(void *pUsr, void *pWti, int)) ConsumerDA)); CHKiRet(wtpSetpfOnWorkerCancel (pThis->pWtpDA, (rsRetVal (*)(void *pUsr, void*pWti)) ConsumerCancelCleanup)); diff --git a/runtime/wti.c b/runtime/wti.c index 32eab57c..346ef7aa 100644 --- a/runtime/wti.c +++ b/runtime/wti.c @@ -210,7 +210,6 @@ ENDobjDestruct(wti) /* Standard-Constructor for the wti object */ BEGINobjConstruct(wti) /* be sure to specify the object type also in END macro! */ - pThis->bOptimizeUniProc = glbl.GetOptimizeUniProc(); pthread_cond_init(&pThis->condExitDone, NULL); pthread_mutex_init(&pThis->mut, NULL); diff --git a/runtime/wtp.c b/runtime/wtp.c index a23e85f9..9891a55c 100644 --- a/runtime/wtp.c +++ b/runtime/wtp.c @@ -78,7 +78,7 @@ wtpGetDbgHdr(wtp_t *pThis) /* Not implemented dummy function for constructor */ -static rsRetVal NotImplementedDummy() { return RS_RET_OK; } +static rsRetVal NotImplementedDummy() { return RS_RET_NOT_IMPLEMENTED; } /* Standard-Constructor for the wtp object */ BEGINobjConstruct(wtp) /* be sure to specify the object type also in END macro! */ diff --git a/tests/da-mainmsg-q.sh b/tests/da-mainmsg-q.sh index dc091e49..2ea6278e 100755 --- a/tests/da-mainmsg-q.sh +++ b/tests/da-mainmsg-q.sh @@ -7,7 +7,6 @@ # check everything recovers from DA mode correctly. # added 2009-04-22 by Rgerhards # This file is part of the rsyslog project, released under GPLv3 -echo "THIS TEST DOES NOT YET WORK RELIABLY!" echo "testing main message queue in DA mode (going to disk)" rm -f work rsyslog.out.log rm -rf test-spool diff --git a/tests/testsuites/da-mainmsg-q.conf b/tests/testsuites/da-mainmsg-q.conf index b55643c0..fbda27d4 100644 --- a/tests/testsuites/da-mainmsg-q.conf +++ b/tests/testsuites/da-mainmsg-q.conf @@ -15,9 +15,6 @@ $MainMsgQueueHighWatermark 80 $MainMsgQueueLowWatermark 40 $MainMsgQueueFilename mainq $MainMsgQueueType linkedlist -$MainMsgQueueDeqzezeSlowdown 1000 -# ucomment, as we now have an issue (finally the test case works ;)) -#$MainMsgQueueDequeueBatchSize 80 $template outfmt,"%msg:F,58:2%\n" $template dynfile,"rsyslog.out.log" # trick to use relative path names! |