diff options
| -rw-r--r-- | action.c | 7 | ||||
| -rw-r--r-- | tools/omfile.c | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -831,11 +831,15 @@ prepareDoActionParams(action_t *pAction, wti_t *pWti, msg_t *pMsg, struct syslog DEFiRet; pWrkrInfo = &(pWti->actWrkrInfo[pAction->iActionNbr]); + if(pAction->eParamPassing == ACT_STRING_PASSING) { + CHKiRet(wtiNewIParam(pWti, pAction, &iparams)); + } + /* here we must loop to process all requested strings */ for(i = 0 ; i < pAction->iNumTpls ; ++i) { +dbgprintf("DDDDD: generating template #%d\n", i); switch(pAction->eParamPassing) { case ACT_STRING_PASSING: - CHKiRet(wtiNewIParam(pWti, pAction, &iparams)); iparams->msgFlags = pMsg->msgFlags; CHKiRet(tplToString(pAction->ppTpl[i], pMsg, &(iparams->staticActStrings[i]), &iparams->staticLenStrings[i], ttNow)); @@ -856,6 +860,7 @@ prepareDoActionParams(action_t *pAction, wti_t *pWti, msg_t *pMsg, struct syslog assert(0); /* software bug if this happens! */ break; } +dbgprintf("DDDDD: template #%d is: '%s'\n", i, iparams->staticActStrings[i]); } finalize_it: diff --git a/tools/omfile.c b/tools/omfile.c index 90efe71a..1ee1026c 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -960,6 +960,7 @@ bufferLine(wrkrInstanceData_t *pWrkrData, uchar *filename, uchar *line) DEFiRet; CHKmalloc(lb = (linebuf_t*) malloc(sizeof(linebuf_t))); +dbgprintf("DDDD: filename '%s'\n", filename); CHKmalloc(lb->filename = ustrdup(filename)); CHKmalloc(lb->ln = ustrdup(line)); lb->pNext = NULL; @@ -1004,6 +1005,7 @@ BEGINdoAction instanceData *pData; CODESTARTdoAction pData = pWrkrData->pData; +dbgprintf("DDDD: bDynName %d, filename '%s'\n", pData->bDynamicName, ppString[1]); iRet = bufferLine(pWrkrData, (pData->bDynamicName) ? ppString[1] : pData->f_fname, ppString[0]); if(iRet == RS_RET_OK) |