Merge pull request #2808 from rgerhards/i1323

more explicit error msg with message modification mod on queue
This commit is contained in:
Rainer Gerhards 2018-07-02 09:34:22 +02:00 committed by GitHub
commit 1948b41d40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -575,7 +575,9 @@ actionConstructFinalize(action_t *__restrict__ const pThis, struct nvlst *lst)
if(pThis->bUsesMsgPassingMode && pThis->pQueue->qType != QUEUETYPE_DIRECT) {
parser_warnmsg("module %s with message passing mode uses "
"non-direct queue. This most probably leads to undesired "
"results", (char*)modGetName(pThis->pMod));
"results. For message modificaton modules (mm*), this means "
"that they will have no effect - "
"see https://www.rsyslog.com/mm-no-queue/", (char*)modGetName(pThis->pMod));
}
/* and now reset the queue params (see comment in its function header!) */
@ -2055,8 +2057,6 @@ addAction(action_t **ppAction, modInfo_t *pMod, void *pModData,
CHKiRet(actionConstructFinalize(pAction, lst));
/* TODO: if we exit here, we have a (quite acceptable...) memory leak */
*ppAction = pAction; /* finally store the action pointer */
finalize_it: