diff options
| author | Tomas Heinrich <theinric@redhat.com> | 2013-05-23 20:22:47 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-05-26 15:19:57 +0200 |
| commit | 388665abdf0565d1d906cf36099babcb1ca5690d (patch) | |
| tree | 1417f02803551474fb856a2260de30ecbb91f38c /plugins/imjournal/imjournal.c | |
| parent | fc88ff2ed27b9e1bfbe162eaec5cf1df11188961 (diff) | |
| download | rsyslog-388665abdf0565d1d906cf36099babcb1ca5690d.tar.gz rsyslog-388665abdf0565d1d906cf36099babcb1ca5690d.tar.bz2 rsyslog-388665abdf0565d1d906cf36099babcb1ca5690d.zip | |
bugfix: imjournal's thread shouldn't be canceled
Because of cancelation, the correct possition in the journal was
lost. This resulted in duplicate messages appearing in the logs.
Diffstat (limited to 'plugins/imjournal/imjournal.c')
| -rwxr-xr-x | plugins/imjournal/imjournal.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c index 07ab4460..aad7194a 100755 --- a/plugins/imjournal/imjournal.c +++ b/plugins/imjournal/imjournal.c @@ -546,16 +546,22 @@ finalize_it: ENDsetModCnf +BEGINisCompatibleWithFeature +CODESTARTisCompatibleWithFeature + if(eFeat == sFEATURENonCancelInputTermination) + iRet = RS_RET_OK; +ENDisCompatibleWithFeature + + BEGINqueryEtryPt CODESTARTqueryEtryPt CODEqueryEtryPt_STD_IMOD_QUERIES CODEqueryEtryPt_STD_CONF2_QUERIES CODEqueryEtryPt_STD_CONF2_setModCnf_QUERIES +CODEqueryEtryPt_IsCompatibleWithFeature_IF_OMOD_QUERIES ENDqueryEtryPt - - BEGINmodInit() CODESTARTmodInit *ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */ |