diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-15 14:51:29 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-15 14:51:29 +0200 |
commit | 90ef0f7a0b3cd025e30611cd30d72beaf86ff18b (patch) | |
tree | fcd439784db76a2c39fc7ce43c53cfc5c02639fd /plugins/impstats | |
parent | 57722664bcdfcd7be425ad3db02a884ff8c17f47 (diff) | |
parent | 72c235744023d10e1a9b44c90b65a6b34029e471 (diff) | |
download | rsyslog-90ef0f7a0b3cd025e30611cd30d72beaf86ff18b.tar.gz rsyslog-90ef0f7a0b3cd025e30611cd30d72beaf86ff18b.tar.xz rsyslog-90ef0f7a0b3cd025e30611cd30d72beaf86ff18b.zip |
Merge branch 'v5-devel'
Conflicts:
plugins/impstats/impstats.c
Diffstat (limited to 'plugins/impstats')
-rw-r--r-- | plugins/impstats/impstats.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/impstats/impstats.c b/plugins/impstats/impstats.c index cbe1779d..35851231 100644 --- a/plugins/impstats/impstats.c +++ b/plugins/impstats/impstats.c @@ -212,7 +212,9 @@ CODEmodInit_QueryRegCFSLineHdlr CHKiRet(objUse(prop, CORE_COMPONENT)); CHKiRet(objUse(errmsg, CORE_COMPONENT)); CHKiRet(objUse(statsobj, CORE_COMPONENT)); + /* the pstatsinverval is an alias to support a previous screwed-up syntax... */ CHKiRet(omsdRegCFSLineHdlr((uchar *)"pstatsinterval", 0, eCmdHdlrInt, NULL, &cs.iStatsInterval, STD_LOADABLE_MODULE_ID, eConfObjGlobal)); + CHKiRet(omsdRegCFSLineHdlr((uchar *)"pstatinterval", 0, eCmdHdlrInt, NULL, &cs.iStatsInterval, STD_LOADABLE_MODULE_ID, eConfObjGlobal)); CHKiRet(omsdRegCFSLineHdlr((uchar *)"pstatfacility", 0, eCmdHdlrInt, NULL, &cs.iFacility, STD_LOADABLE_MODULE_ID, eConfObjGlobal)); CHKiRet(omsdRegCFSLineHdlr((uchar *)"pstatseverity", 0, eCmdHdlrInt, NULL, &cs.iSeverity, STD_LOADABLE_MODULE_ID, eConfObjGlobal)); CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID, eConfObjGlobal)); |