diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-26 12:48:57 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-26 12:48:57 +0200 |
| commit | f2528ec101eb660560c7ec327d440cbb17f04f14 (patch) | |
| tree | 05083efcd96dedc9387579caa17c81b8b78592c6 /runtime/conf.c | |
| parent | ceb336f0398e37ab51b4b54a14fa394d53ccdf3f (diff) | |
| parent | 0c7604dc27119122a3022c7bf094ffb5f8d59e6d (diff) | |
| download | rsyslog-f2528ec101eb660560c7ec327d440cbb17f04f14.tar.gz rsyslog-f2528ec101eb660560c7ec327d440cbb17f04f14.tar.bz2 rsyslog-f2528ec101eb660560c7ec327d440cbb17f04f14.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/conf.c
tools/omfile.c
tools/omusrmsg.c
Diffstat (limited to 'runtime/conf.c')
| -rw-r--r-- | runtime/conf.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index f47ac501..ec612ab8 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -716,6 +716,7 @@ rsRetVal cflineDoAction(rsconf_t *conf, uchar **p, action_t **ppAction) modInfo_t *pMod; cfgmodules_etry_t *node; omodStringRequest_t *pOMSR; + int bHadWarning = 0; action_t *pAction = NULL; void *pModData; DEFiRet; @@ -735,6 +736,10 @@ rsRetVal cflineDoAction(rsconf_t *conf, uchar **p, action_t **ppAction) pMod = node->pMod; iRet = pMod->mod.om.parseSelectorAct(p, &pModData, &pOMSR); dbgprintf("tried selector action for %s: %d\n", module.GetName(pMod), iRet); + if(iRet == RS_RET_OK_WARN) { + bHadWarning = 1; + iRet = RS_RET_OK; + } if(iRet == RS_RET_OK || iRet == RS_RET_SUSPENDED) { /* advance our config parser state: we now only accept an $End as valid, * no more action statments. @@ -769,6 +774,8 @@ rsRetVal cflineDoAction(rsconf_t *conf, uchar **p, action_t **ppAction) } *ppAction = pAction; + if(iRet == RS_RET_OK && bHadWarning) + iRet = RS_RET_OK_WARN; RETiRet; } |