From 27866eddb99885b6617fde0ee91ea7b1cd4873fb Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 14 Apr 2011 12:30:45 +0200
Subject: bugfix: doc for impstats had wrong config statements

also, config statements were named a bit inconsistent, resolved that
problem by introducing an alias and only documenting the consistent
statements
Thanks to Marcin for bringing up this problem.
---
 ChangeLog                   |  5 +++++
 doc/impstats.html           | 10 +++++-----
 plugins/impstats/impstats.c |  2 ++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f558301d..2d25cb53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 Version 5.8.1  [V5-stable] (rgerhards), 2011-04-??
 - bugfix: $myhostname not available in RainerScript (and no error message)
   closes: http://bugzilla.adiscon.com/show_bug.cgi?id=233
+- bugfix: doc for impstats had wrong config statements
+  also, config statements were named a bit inconsistent, resolved that
+  problem by introducing an alias and only documenting the consistent
+  statements
+  Thanks to Marcin for bringing up this problem.
 ---------------------------------------------------------------------------
 Version 5.8.0  [V5-stable] (rgerhards), 2011-04-12
 
diff --git a/doc/impstats.html b/doc/impstats.html
index 3b4191e8..cede4874 100644
--- a/doc/impstats.html
+++ b/doc/impstats.html
@@ -22,16 +22,16 @@ settings, this impact may be severe (for high-load environments).
 </p>
 <p><b>Configuration Directives</b>:</p>
 <ul>
-<li>$PStatsInterval &lt;Seconds&gt;<br>
+<li>$PStatInterval &lt;Seconds&gt;<br>
 Sets the interval, in <b>seconds</b> at which messages are generated. Please note that the
 actual interval may be a bit longer. We do not try to be precise and so the interval is
 actually a sleep period which is entered after generating all messages. So the actual 
 interval is what is configured here plus the actual time required to generate messages.
 In general, the difference should not really matter.
-<li>$PStatsFacility &lt;numerical facility&gt;<br>
+<li>$PStatFacility &lt;numerical facility&gt;<br>
 The numerical syslog facility code to be used for generated messages. Default
 is 5 (syslog).This is useful for filtering messages.</li>
-<li>$PStatsSeverity &lt;numerical severity&gt;<br>
+<li>$PStatSeverity &lt;numerical severity&gt;<br>
 The numerical syslog severity code to be used for generated messages. Default
 is 6 (info).This is useful for filtering messages.</li>
 </ul>
@@ -45,8 +45,8 @@ stats may not get turned on in all places.</li>
 <p>This activates the module and records messages to /var/log/rsyslog-stats in 10 minute intervals:<br>
 </p>
 <textarea rows="8" cols="60">$ModLoad impstats
-$PStatsInterval 600
-$PStatsSeverity 7
+$PStatInterval 600
+$PStatSeverity 7
 
 syslog.debug  /var/log/rsyslog-stats
 </textarea>
diff --git a/plugins/impstats/impstats.c b/plugins/impstats/impstats.c
index aa98ae9d..cfbbad76 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));
+	CHKiRet(omsdRegCFSLineHdlr((uchar *)"pstatinterval", 0, eCmdHdlrInt, NULL, &cs.iStatsInterval, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"pstatfacility", 0, eCmdHdlrInt, NULL, &cs.iFacility, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"pstatseverity", 0, eCmdHdlrInt, NULL, &cs.iSeverity, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID));
-- 
cgit