diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-01 11:47:22 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-01 11:47:22 +0100 |
| commit | 3710954379ebc18684e8ef3839b2801556d69758 (patch) | |
| tree | 56d506bdb90cdfa0b47100df15b43dc1d73f2db2 | |
| parent | 062eb2b96f2d357960daecdc38c3ad92813e906a (diff) | |
| download | rsyslog-3710954379ebc18684e8ef3839b2801556d69758.tar.gz rsyslog-3710954379ebc18684e8ef3839b2801556d69758.tar.bz2 rsyslog-3710954379ebc18684e8ef3839b2801556d69758.zip | |
omjournal: support v8 omod interface
| -rw-r--r-- | doc/rsyslog_conf_modules.html | 2 | ||||
| -rw-r--r-- | plugins/omjournal/omjournal.c | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/doc/rsyslog_conf_modules.html b/doc/rsyslog_conf_modules.html index 10395986..d2c7cca3 100644 --- a/doc/rsyslog_conf_modules.html +++ b/doc/rsyslog_conf_modules.html @@ -54,7 +54,7 @@ and messages be transmitted to various different targets. <ul> <li><a href="omfile.html">omfile</a> - file output module</li> <li><a href="omfwd.html">omfwd</a> (does NOT yet work in v8) - syslog forwarding output module</li> -<li><a href="omjournal.html">omjournal</a> (does NOT yet work in v8) - Linux journal output module</li> +<li><a href="omjournal.html">omjournal</a> - Linux journal output module</li> <li><a href="ompipe.html">ompipe</a> - named pipe output module</li> <li><a href="omusrmsg.html">omusrmsg</a> - user message output module</li> <li><a href="omsnmp.html">omsnmp</a> (does NOT yet work in v8) - SNMP trap output module</li> diff --git a/plugins/omjournal/omjournal.c b/plugins/omjournal/omjournal.c index 160c369d..82fd7bfb 100644 --- a/plugins/omjournal/omjournal.c +++ b/plugins/omjournal/omjournal.c @@ -56,6 +56,10 @@ DEF_OMOD_STATIC_DATA typedef struct _instanceData { } instanceData; +typedef struct wrkrInstanceData { + instanceData *pData; +} wrkrInstanceData_t; + struct modConfData_s { rsconf_t *pConf; /* our overall config object */ }; @@ -91,6 +95,11 @@ CODESTARTcreateInstance ENDcreateInstance +BEGINcreateWrkrInstance +CODESTARTcreateWrkrInstance +ENDcreateWrkrInstance + + BEGINisCompatibleWithFeature CODESTARTisCompatibleWithFeature ENDisCompatibleWithFeature @@ -101,6 +110,11 @@ CODESTARTfreeInstance ENDfreeInstance +BEGINfreeWrkrInstance +CODESTARTfreeWrkrInstance +ENDfreeWrkrInstance + + BEGINnewActInst CODESTARTnewActInst /* Note: we currently do not have any parameters, so we do not need @@ -172,6 +186,7 @@ ENDmodExit BEGINqueryEtryPt CODESTARTqueryEtryPt CODEqueryEtryPt_STD_OMOD_QUERIES +CODEqueryEtryPt_STD_OMOD8_QUERIES CODEqueryEtryPt_STD_CONF2_OMOD_QUERIES CODEqueryEtryPt_STD_CONF2_QUERIES ENDqueryEtryPt |