summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/templates/rsyslog/rsyslog.conf.j23
-rwxr-xr-xsmoketest/scripts/cli/test_system_syslog.py2
2 files changed, 2 insertions, 3 deletions
diff --git a/data/templates/rsyslog/rsyslog.conf.j2 b/data/templates/rsyslog/rsyslog.conf.j2
index 45742b073..c6eb6430c 100644
--- a/data/templates/rsyslog/rsyslog.conf.j2
+++ b/data/templates/rsyslog/rsyslog.conf.j2
@@ -64,7 +64,7 @@ if prifilt("{{ tmp | join(',') }}") then {
action(
type="omfile"
file="/var/log/messages"
- queue.size="262144"
+ rotation.sizeLimit="524288" # 512Kib - maximum filesize before rotation
rotation.sizeLimitCommand="/usr/sbin/logrotate {{ logrotate }}"
)
}
@@ -120,4 +120,3 @@ if prifilt("{{ tmp | join(',') }}") then {
# Include all configuration files in /etc/rsyslog.d/
include(file="/etc/rsyslog.d/*.conf")
-
diff --git a/smoketest/scripts/cli/test_system_syslog.py b/smoketest/scripts/cli/test_system_syslog.py
index bf6d3134d..1fd9ee18d 100755
--- a/smoketest/scripts/cli/test_system_syslog.py
+++ b/smoketest/scripts/cli/test_system_syslog.py
@@ -117,7 +117,7 @@ class TestRSYSLOGService(VyOSUnitTestSHIM.TestCase):
self.assertIn( ' action(', config)
self.assertIn( ' type="omfile"', config)
self.assertIn( ' file="/var/log/messages"', config)
- self.assertIn( ' queue.size="262144"', config)
+ self.assertIn( ' rotation.sizeLimit="524288"', config)
self.assertIn( ' rotation.sizeLimitCommand="/usr/sbin/logrotate /etc/logrotate.d/vyos-rsyslog"', config)
def test_remote(self):