Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CA-390129: Handle & log exceptions in dump_xapi_rrds(hidden and disabled) #94

Merged
merged 1 commit into from
Mar 25, 2024
Merged

CA-390129: Handle & log exceptions in dump_xapi_rrds(hidden and disabled) #94

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions xen-bugtool
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ import traceback
import xml
import zipfile
from collections import OrderedDict
from contextlib import contextmanager
from hashlib import md5 as md5_new
from select import select
from signal import SIGHUP, SIGTERM, SIGUSR1
Expand Down Expand Up @@ -520,7 +521,16 @@ def no_unicode(x):
return x


def log_internal_error(e):
@contextmanager
def log_exceptions():
"""Context manager to log exceptions."""
try:
yield
except Exception as e: # pylint: disable=broad-except
log("%s, %s" % (e, traceback.format_exc()))


def log_internal_error(_):
"""Log an internal error and return an empty string as bugtool output data"""
log("bugtool: Internal error: " + traceback.format_exc())
return "" # For now, no diagnostic output in the individual output files
Expand Down Expand Up @@ -1130,7 +1140,8 @@ exclude those logs from the archive.
# tree_output(CAP_PAM, SAMBA_DATA_DIR) # Explictly skip samba data as it contains credentials
tree_output(CAP_PAM, VAR_LOG_DIR + "samba")

dump_xapi_rrds(entries)
with log_exceptions():
dump_xapi_rrds(entries)

cmd_output(CAP_PROCESS_LIST, [PS, 'wwwaxf', '-eo', 'pid,tty,stat,time,nice,psr,pcpu,pmem,nwchan,wchan:25,args'], label='process-tree')
func_output(CAP_PROCESS_LIST, 'fd_usage', fd_usage)
Expand Down
Loading