From 400a94ab1a94c18067642cd281e8bfde48c25d40 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Sun, 20 Jul 2025 12:01:22 -0500 Subject: T6704: limit size of noteworthy list in airbag Use deque instead of list to limit the size of collected stderr messages in airbag. --- python/vyos/airbag.py | 6 ++++-- python/vyos/defaults.py | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'python') diff --git a/python/vyos/airbag.py b/python/vyos/airbag.py index a869daae8..1dcccdd47 100644 --- a/python/vyos/airbag.py +++ b/python/vyos/airbag.py @@ -15,10 +15,12 @@ import sys from datetime import datetime +from collections import deque from vyos import debug from vyos.logger import syslog from vyos.version import get_full_version_data +from vyos.defaults import airbag_noteworthy_size def enable(log=True): @@ -27,7 +29,7 @@ def enable(log=True): _intercepting_exceptions() -_noteworthy = [] +_noteworthy = deque(maxlen=airbag_noteworthy_size) def noteworthy(msg): @@ -72,7 +74,7 @@ def bug_report(dtype, value, trace): note = '' if _noteworthy: note = 'noteworthy:\n' - note += '\n'.join(_noteworthy) + note += '\n'.join(list(_noteworthy)) information.update({ 'date': datetime.now().strftime('%Y-%m-%d %H:%M:%S'), diff --git a/python/vyos/defaults.py b/python/vyos/defaults.py index fbb5a0393..5e3ba4e63 100644 --- a/python/vyos/defaults.py +++ b/python/vyos/defaults.py @@ -88,3 +88,5 @@ DEFAULT_COMMIT_CONFIRM_MINUTES = 10 commit_hooks = {'pre': '/etc/commit/pre-hooks.d', 'post': '/etc/commit/post-hooks.d' } + +airbag_noteworthy_size = 20 -- cgit v1.2.3