rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-20 07:20:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename legacy imjournal configs to have "imjournal" prepended.

Browse Source 
modified:   doc/imjournal.html
	modified:   plugins/imjournal/imjournal.c
This commit is contained in:
Milan Bartos 2013-06-13 10:27:59 +02:00 committed by Rainer Gerhards
parent 82688df6b5
commit 77fd80604e
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/imjournal.html
View File

@ -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>

6
plugins/imjournal/imjournal.c
View File

@ -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));