From 77fd80604e723249e902019ef87f6e3a53282c28 Mon Sep 17 00:00:00 2001
From: Milan Bartos <milan@bartos.se>
Date: Thu, 13 Jun 2013 10:27:59 +0200
Subject: Rename legacy imjournal configs to have "imjournal" prepended.

	modified:   doc/imjournal.html
	modified:   plugins/imjournal/imjournal.c
---
 doc/imjournal.html            | 11 +++++++++++
 plugins/imjournal/imjournal.c |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/doc/imjournal.html b/doc/imjournal.html
index e3f64502..dbf9279e 100644
--- a/doc/imjournal.html
+++ b/doc/imjournal.html
@@ -41,5 +41,16 @@ $template CEETemplate,"%TIMESTAMP% %HOSTNAME% %syslogtag% @cee: %$!all-json%\n"
 *.* :mmjsonparse:
 *.* /var/log/ceelog;CEETemplate
 </textarea>
+
+<p><b>Legacy Configuration Directoves</b>:</p>
+<ul>
+<li><strong>$ImjournalPersistStateInterval [lines]</strong><br>
+It specifies how often should the journal state be persisted. This option is useful for rsyslog to start reading from the last journal message it read.
+</li>
+<li><strong>$ImjournalStateFile&nbsp;/path/to/file</strong><br>
+It specifies where the state file for persisting journal state is located.
+</li>
+</ul>
+
 </body>
 </html>
diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c
index ae29154d..8f1824c9 100755
--- a/plugins/imjournal/imjournal.c
+++ b/plugins/imjournal/imjournal.c
@@ -79,7 +79,7 @@ static struct cnfparamblk modpblk =
 
 #define DFLT_persiststateinterval 10
 
-static int bLegacyCnfModGlobalsPermitted = 0;/* are legacy module-global config parameters permitted? */
+static int bLegacyCnfModGlobalsPermitted = 1;/* are legacy module-global config parameters permitted? */
 
 static prop_t *pInputName = NULL;	/* there is only one global inputName for all messages generated by this module */
 static prop_t *pLocalHostIP = NULL;	/* a pseudo-constant propterty for 127.0.0.1 */
@@ -632,9 +632,9 @@ CODEmodInit_QueryRegCFSLineHdlr
 	CHKiRet(prop.CreateStringProp(&pInputName, UCHAR_CONSTANT("imjournal"), sizeof("imjournal") - 1));
 	CHKiRet(prop.CreateStringProp(&pLocalHostIP, UCHAR_CONSTANT("127.0.0.1"), sizeof("127.0.0.1") - 1));
 
-	CHKiRet(omsdRegCFSLineHdlr((uchar *)"persiststateinterval", 0, eCmdHdlrInt,
+	CHKiRet(omsdRegCFSLineHdlr((uchar *)"imjournalpersiststateinterval", 0, eCmdHdlrInt,
 		NULL, &cs.iPersistStateInterval, STD_LOADABLE_MODULE_ID));
-	CHKiRet(omsdRegCFSLineHdlr((uchar *)"statefile", 0, eCmdHdlrGetWord,
+	CHKiRet(omsdRegCFSLineHdlr((uchar *)"imjournalstatefile", 0, eCmdHdlrGetWord,
 		NULL, &cs.stateFile, STD_LOADABLE_MODULE_ID));
 
 
-- 
cgit v1.2.3