diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-30 09:59:02 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-30 09:59:02 +0100 |
| commit | 7df68798be96d38fcb17143daa2c3e2b093a8ba5 (patch) | |
| tree | f57ed7d3a994d2f62fe8cf26b2cbc19bc9a0bd0f | |
| parent | 1b75cd3b4567cbd0605cc2a6d397c5dc3a6230f5 (diff) | |
| download | rsyslog-7df68798be96d38fcb17143daa2c3e2b093a8ba5.tar.gz rsyslog-7df68798be96d38fcb17143daa2c3e2b093a8ba5.tar.bz2 rsyslog-7df68798be96d38fcb17143daa2c3e2b093a8ba5.zip | |
bugfix[minor]: invalid error code when mmnormalize could not access rulebase
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | plugins/mmnormalize/mmnormalize.c | 6 | ||||
| -rw-r--r-- | runtime/rsyslog.h | 1 |
3 files changed, 6 insertions, 3 deletions
@@ -12,6 +12,8 @@ Version 7.3.5 [devel] 2012-11-?? actions properly started up, but the actions did not produce proper data. Now, there are startup error messages and the actions are NOT executed (due to missing template due to template error). +- bugfix[minor]: invalid error code when mmnormalize could not access + rulebase - doc bugfix: corrections and improvements in mmnormalize html doc page --------------------------------------------------------------------------- Version 7.3.4 [devel] 2012-11-23 diff --git a/plugins/mmnormalize/mmnormalize.c b/plugins/mmnormalize/mmnormalize.c index 9dbde497..fd2004a3 100644 --- a/plugins/mmnormalize/mmnormalize.c +++ b/plugins/mmnormalize/mmnormalize.c @@ -117,7 +117,7 @@ buildInstance(instanceData *pData) } ln_setEECtx(pData->ctxln, pData->ctxee); if(ln_loadSamples(pData->ctxln, (char*) pData->rulebase) != 0) { - errmsg.LogError(0, RS_RET_NO_RULESET, "error: normalization rulebase '%s' " + errmsg.LogError(0, RS_RET_NO_RULEBASE, "error: normalization rulebase '%s' " "could not be loaded cannot activate action", cs.rulebase); ee_exitCtx(pData->ctxee); ln_exitCtx(pData->ctxln); @@ -301,9 +301,9 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) } if(cs.rulebase == NULL) { - errmsg.LogError(0, RS_RET_NO_RULESET, "error: no normalization rulebase was specified, use " + errmsg.LogError(0, RS_RET_NO_RULEBASE, "error: no normalization rulebase was specified, use " "$MMNormalizeSampleDB directive first!"); - ABORT_FINALIZE(RS_RET_NO_RULESET); + ABORT_FINALIZE(RS_RET_NO_RULEBASE); } /* ok, if we reach this point, we have something for us */ diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index c00b5d95..35d8850d 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -397,6 +397,7 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_DEPRECATED = -2307,/**< deprecated functionality is used */ RS_RET_DS_PROP_SEQ_ERR = -2308,/**< property sequence error deserializing object */ RS_RET_TPL_INVLD_PROP = -2309,/**< property name error in template (unknown name) */ + RS_RET_NO_RULEBASE = -2310,/**< mmnormalize: rulebase can not be found or otherwise invalid */ /* RainerScript error messages (range 1000.. 1999) */ RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */ |