diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-06 13:08:43 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-06 13:08:43 +0100 |
| commit | 081382b5630261902afb2b18fbaa1697ed220c4c (patch) | |
| tree | aceb768b22cf40b33db06caef9145917c743d1f5 /action.c | |
| parent | cb4848040ebbb83a8df49a18e686a324fa4879f8 (diff) | |
| parent | ec32919ca05598f11f538060c406d8668a35e229 (diff) | |
| download | rsyslog-081382b5630261902afb2b18fbaa1697ed220c4c.tar.gz rsyslog-081382b5630261902afb2b18fbaa1697ed220c4c.tar.bz2 rsyslog-081382b5630261902afb2b18fbaa1697ed220c4c.zip | |
Merge branch 'master-ruleeng' into master-ruleeng-simd
Conflicts:
doc/rsyslog_conf_actions.html
Diffstat (limited to 'action.c')
| -rw-r--r-- | action.c | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -1604,20 +1604,14 @@ actionNewInst(struct nvlst *lst, action_t **ppAction) omodStringRequest_t *pOMSR; void *pModData; action_t *pAction; - int typeIdx; DEFiRet; paramvals = nvlstGetParams(lst, &pblk, NULL); if(paramvals == NULL) { - ABORT_FINALIZE(RS_RET_ERR); + ABORT_FINALIZE(RS_RET_PARAM_ERROR); } dbgprintf("action param blk after actionNewInst:\n"); cnfparamsPrint(&pblk, paramvals); - typeIdx = cnfparamGetIdx(&pblk, "type"); - if(paramvals[typeIdx].bUsed == 0) { - errmsg.LogError(0, RS_RET_CONF_RQRD_PARAM_MISSING, "action type missing"); - ABORT_FINALIZE(RS_RET_CONF_RQRD_PARAM_MISSING); // TODO: move this into rainerscript handlers - } cnfModName = (uchar*)es_str2cstr(paramvals[cnfparamGetIdx(&pblk, ("type"))].val.d.estr, NULL); if((pMod = module.FindWithCnfName(loadConf, cnfModName, eMOD_OUT)) == NULL) { errmsg.LogError(0, RS_RET_MOD_UNKNOWN, "module name '%s' is unknown", cnfModName); |