summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Bartos <mbartos@redhat.com>2013-03-20 13:01:37 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-03-20 13:01:37 +0100
commita8e83e494720c3657a74cacb367241f8991d6d73 (patch)
treec65869fdbb189908ee72ddbb57c63adadc816efa
parent4658846f9585027385ffbbd772ed004a34c34e28 (diff)
downloadrsyslog-a8e83e494720c3657a74cacb367241f8991d6d73.tar.gz
rsyslog-a8e83e494720c3657a74cacb367241f8991d6d73.tar.bz2
rsyslog-a8e83e494720c3657a74cacb367241f8991d6d73.zip
bugfix: imuxsock rate-limiting could not be configured via legacy conf
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
-rw-r--r--ChangeLog6
-rw-r--r--plugins/imuxsock/imuxsock.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c517cb89..1f6c4bf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,12 @@ Version 7.2.7 [v7-stable] 2013-03-??
- improved debugging support in forked (auto-backgrounding) mode
The rsyslog debug log file is now continued to be written across the
fork.
+- bugfix: imuxsock rate-limiting could not be configured via legacy conf
+ Rate-limiting for the system socket could not be configured via legacy
+ configuration directives. However, the new-style RainerScript config
+ options worked.
+ Thanks to Milan Bartos for the patch.
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=390
- bugfix: using group resolution could lead to endless loop
Thanks to Tomas Heinrich for the patch.
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=310
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index 637cb133..1a2b696e 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -1300,6 +1300,9 @@ CODESTARTendCnfLoad
loadModConf->bUseFlowCtl = cs.bUseFlowCtlSysSock;
loadModConf->bAnnotateSysSock = cs.bAnnotateSysSock;
loadModConf->bParseTrusted = cs.bParseTrusted;
+ loadModConf->ratelimitIntervalSysSock = cs.ratelimitIntervalSysSock;
+ loadModConf->ratelimitBurstSysSock = cs.ratelimitBurstSysSock;
+ loadModConf->ratelimitSeveritySysSock = cs.ratelimitSeveritySysSock;
}
loadModConf = NULL; /* done loading */