diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 15:38:09 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 15:38:09 +0200 |
| commit | 7bebfd3b60894bd913e3d6cbcad5447a607e0a0b (patch) | |
| tree | 4243c632639de11ccb08eebd014851f1bc3f6711 /plugins/omruleset/omruleset.c | |
| parent | 156382746626459aaf64d79eac95183d1ab60680 (diff) | |
| parent | 2ae9e456db8991e61b4aa48cf9b74f6d20689ce4 (diff) | |
| download | rsyslog-7bebfd3b60894bd913e3d6cbcad5447a607e0a0b.tar.gz rsyslog-7bebfd3b60894bd913e3d6cbcad5447a607e0a0b.tar.bz2 rsyslog-7bebfd3b60894bd913e3d6cbcad5447a607e0a0b.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'plugins/omruleset/omruleset.c')
| -rw-r--r-- | plugins/omruleset/omruleset.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/omruleset/omruleset.c b/plugins/omruleset/omruleset.c index 67aee97e..6c770c94 100644 --- a/plugins/omruleset/omruleset.c +++ b/plugins/omruleset/omruleset.c @@ -165,6 +165,9 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) p += sizeof(":omruleset:") - 1; /* eat indicator sequence (-1 because of '\0'!) */ CHKiRet(createInstance(&pData)); + errmsg.LogError(0, RS_RET_DEPRECATED, "warning: omruleset is deprecated, consider " + "using the 'call' statement instead"); + /* check if a non-standard template is to be applied */ if(*(p-1) == ';') --p; @@ -237,6 +240,9 @@ CODEmodInit_QueryRegCFSLineHdlr CHKiRet(objUse(ruleset, CORE_COMPONENT)); CHKiRet(objUse(errmsg, CORE_COMPONENT)); + errmsg.LogError(0, RS_RET_DEPRECATED, "warning: omruleset is deprecated, consider " + "using the 'call' statement instead"); + CHKiRet(omsdRegCFSLineHdlr((uchar *)"actionomrulesetrulesetname", 0, eCmdHdlrGetWord, setRuleset, NULL, STD_LOADABLE_MODULE_ID)); CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, |