diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 15:27:27 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 15:27:27 +0200 |
| commit | a208fcfc707c8c69b79e7623383a2c592d9f0741 (patch) | |
| tree | 9e053917a4e5c1cb00362199e1968a6685bcb432 | |
| parent | 0f879f21add90b171280bf33c5e2c7ce26bdfe0f (diff) | |
| download | rsyslog-a208fcfc707c8c69b79e7623383a2c592d9f0741.tar.gz rsyslog-a208fcfc707c8c69b79e7623383a2c592d9f0741.tar.xz rsyslog-a208fcfc707c8c69b79e7623383a2c592d9f0741.zip | |
added deprecated note to omruleset
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | plugins/omruleset/omruleset.c | 6 | ||||
| -rw-r--r-- | runtime/rsyslog.h | 1 |
3 files changed, 10 insertions, 0 deletions
@@ -1,4 +1,7 @@ --------------------------------------------------------------------------- +Version 7.1.11 [beta] 2012-10-?? +- added deprecated note to omruleset (plus clue to use "call") + --------------------------------------------------------------------------- Version 7.1.10 [beta] 2012-10-11 - bugfix: m4 directory was not present in release tarball - bugfix: small memory leak with string-type templates 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, diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index 4404c475..07d58d68 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -392,6 +392,7 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_JNAME_NOTFOUND = -2305, /**< JSON name not found (does not exist) */ RS_RET_INVLD_SETOP = -2305, /**< invalid variable set operation, incompatible type */ RS_RET_RULESET_EXISTS = -2306,/**< ruleset already exists */ + RS_RET_DEPRECATED = -2307,/**< deprecated functionality is used */ /* RainerScript error messages (range 1000.. 1999) */ RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */ |