remove parameter rate_limit_burst and rate_limit_interval from client…

…, as this duplicates settings in init, refs saz#247
bojleros · Jan 18, 2017 · 9db3f5b · 9db3f5b
1 parent e976d9d
commit 9db3f5b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -270,8 +270,6 @@ The following lists all the class parameters this module accepts.
     actionfiletemplate_cust             STRING              If set this defines the `ActionFileDefaultTemplate custom formatting` which sets customisations over the default log format for remote and local logging. Must be used with actionfiletemplate to take effect. Defaults to false.
     actionfiletemplate                  STRING              If set this defines the `ActionFileDefaultTemplate` which sets the default logging format for remote and local logging.
     high_precision_timestamps           true,false          Whether or not to use high precision timestamps.
-    rate_limit_burst                    INTEGER             Specifies the number of messages in $rate_limit_interval before limiting begins. Defaults to undef.
-    rate_limit_interval                 INTEGER             Specifies the number of seconds per rate limit interval. Defaults to undef.
 
     RSYSLOG::DATABASE CLASS PARAMETERS  VALUES              DESCRIPTION
     -------------------------------------------------------------------

diff --git a/manifests/client.pp b/manifests/client.pp
@@ -30,8 +30,6 @@
 # [*actionfiletemplate_cust*]
 # [*actionfiletemplate*]
 # [*high_precision_timestamps*]
-# [*rate_limit_burst*]
-# [*rate_limit_interval*]
 # [*imfiles*]
 #
 # === Variables
@@ -68,8 +66,6 @@
   $actionfiletemplate_cust   = false,
   $actionfiletemplate        = false,
   $high_precision_timestamps = false,
-  $rate_limit_burst          = undef,
-  $rate_limit_interval       = undef,
   $imfiles                   = undef
 ) inherits rsyslog::params {
   include ::rsyslog

diff --git a/templates/client/config.conf.erb b/templates/client/config.conf.erb
@@ -42,13 +42,6 @@ $ActionFileDefaultTemplate RSYSLOG_FileFormat
 <% end -%>
 <% end -%>
 
-<% if scope.lookupvar('rsyslog::client::rate_limit_burst') and scope.lookupvar('rsyslog::client::rate_limit_burst') != :undef -%>
-$SystemLogRateLimitBurst <%= scope.lookupvar('rsyslog::client::rate_limit_burst') %>
-<% end -%>
-<% if scope.lookupvar('rsyslog::client::rate_limit_interval') and scope.lookupvar('rsyslog::client::rate_limit_interval') != :undef -%>
-$SystemLogRateLimitInterval <%= scope.lookupvar('rsyslog::client::rate_limit_interval') %>
-<% end -%>
-
 <% if scope.lookupvar('rsyslog::client::listen_localhost') -%>
 # Provides UDP syslog reception
 $ModLoad imudp

diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb
@@ -29,8 +29,12 @@ $MaxMessageSize <%= scope.lookupvar('rsyslog::max_message_size') %>
 #
 # Set rate limit for messages received.
 # 
+<%- if @system_log_rate_limit_interval -%>
 $SystemLogRateLimitInterval <%= scope.lookupvar('rsyslog::system_log_rate_limit_interval') %>
+<%- end -%>
+<%- if @system_log_rate_limit_burst -%>
 $SystemLogRateLimitBurst <%= scope.lookupvar('rsyslog::system_log_rate_limit_burst') %>
+<%- end -%>
 
 <% if scope.lookupvar('rsyslog::default_template') and scope.lookupvar('rsyslog::default_template') != :undef and scope.lookupvar('rsyslog::default_template_customisation') and scope.lookupvar('rsyslog::default_template_customisation') != :undef -%>
 #