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/module-template.h | |
parent | ceb336f0398e37ab51b4b54a14fa394d53ccdf3f (diff) | |
parent | 0c7604dc27119122a3022c7bf094ffb5f8d59e6d (diff) | |
download | rsyslog-f2528ec101eb660560c7ec327d440cbb17f04f14.tar.gz rsyslog-f2528ec101eb660560c7ec327d440cbb17f04f14.tar.xz 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/module-template.h')
-rw-r--r-- | runtime/module-template.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/module-template.h b/runtime/module-template.h index d360447a..95107cb6 100644 --- a/runtime/module-template.h +++ b/runtime/module-template.h @@ -285,7 +285,7 @@ static rsRetVal parseSelectorAct(uchar **pp, void **ppModData, omodStringRequest #define CODE_STD_FINALIZERparseSelectorAct \ finalize_it:\ - if(iRet == RS_RET_OK || iRet == RS_RET_SUSPENDED) {\ + if(iRet == RS_RET_OK || iRet == RS_RET_OK_WARN || iRet == RS_RET_SUSPENDED) {\ *ppModData = pData;\ *pp = p;\ } else {\ |