summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-07-15 14:50:17 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-07-15 14:50:17 +0200
commit19864adc4799ce57204fdabb7049e8ec856ed452 (patch)
treef88ec6fd920cc7909703775e37469bbc3c0e6e81
parent68d6ff93cd352dc1cbea4827551d12d133f0c41d (diff)
downloadrsyslog-19864adc4799ce57204fdabb7049e8ec856ed452.tar.gz
rsyslog-19864adc4799ce57204fdabb7049e8ec856ed452.tar.xz
rsyslog-19864adc4799ce57204fdabb7049e8ec856ed452.zip
bugfix: mark messages were not correctly written to text log files
the markmessageinterval was not correctly propagated to all places where it was needed. This resulted in rsyslog using the default (20 minutes) in some code pathes, what looked to the user like mark messages were never written.
-rw-r--r--ChangeLog5
-rw-r--r--plugins/immark/immark.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e8619d8..02cb75fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,11 @@ Version 3.18.1 (rgerhards), 2008-07-??
is just a simple addition of faciltity and severity). I have changed
this to use own, consistent, code for PRI calculation. [Backport from
3.19.10]
+- bugfix: mark messages were not correctly written to text log files
+ the markmessageinterval was not correctly propagated to all places
+ where it was needed. This resulted in rsyslog using the default
+ (20 minutes) in some code pathes, what looked to the user like mark
+ messages were never written.
---------------------------------------------------------------------------
Version 3.18.0 (rgerhards), 2008-07-11
- begun a new v3-stable based on former 3.17.4 beta plus patches to
diff --git a/plugins/immark/immark.c b/plugins/immark/immark.c
index 30118de0..0bc31995 100644
--- a/plugins/immark/immark.c
+++ b/plugins/immark/immark.c
@@ -84,6 +84,8 @@ ENDrunInput
BEGINwillRun
CODESTARTwillRun
+ /* We set the global MarkInterval to what is configured here -- rgerhards, 2008-07-15 */
+ MarkInterval = iMarkMessagePeriod;
if(iMarkMessagePeriod == 0)
iRet = RS_RET_NO_RUN;
ENDwillRun