From 2ca7cd468f8cfe047e28a4fc65238c939943bb67 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Fri, 10 Jan 2025 14:03:44 -0700 Subject: [PATCH] Modify terminal helper --- .../management/commands/create_federal_portfolio.py | 9 ++++++--- .../management/commands/utility/terminal_helper.py | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/registrar/management/commands/create_federal_portfolio.py b/src/registrar/management/commands/create_federal_portfolio.py index b70df8ee4..7387f076c 100644 --- a/src/registrar/management/commands/create_federal_portfolio.py +++ b/src/registrar/management/commands/create_federal_portfolio.py @@ -113,9 +113,12 @@ class Command(BaseCommand): if parse_requests or both: domain_requests = self.handle_portfolio_requests(portfolio, federal_agency) - all_suborganizations.extend(suborganizations) - all_domains.extend(domains) - all_domain_requests.extend(domain_requests) + if suborganizations: + all_suborganizations.extend(suborganizations) + if all_domains: + all_domains.extend(domains) + if domain_requests: + all_domain_requests.extend(domain_requests) except Exception as exec: self.failed_portfolios.add(federal_agency) logger.error(exec) diff --git a/src/registrar/management/commands/utility/terminal_helper.py b/src/registrar/management/commands/utility/terminal_helper.py index b16ca72f2..87d9f12e5 100644 --- a/src/registrar/management/commands/utility/terminal_helper.py +++ b/src/registrar/management/commands/utility/terminal_helper.py @@ -442,13 +442,14 @@ class TerminalHelper: f.write(file_contents) @staticmethod - def colorful_logger(log_level, color, message): + def colorful_logger(log_level, color, message, exc_info=True): """Adds some color to your log output. Args: log_level: str | Logger.method -> Desired log level. ex: logger.info or "INFO" color: str | TerminalColors -> Output color. ex: TerminalColors.YELLOW or "YELLOW" message: str -> Message to display. + exc_info: bool -> Whether the log should print exc_info or not """ if isinstance(log_level, str) and hasattr(logger, log_level.lower()): @@ -462,4 +463,4 @@ class TerminalHelper: terminal_color = color colored_message = f"{terminal_color}{message}{TerminalColors.ENDC}" - log_method(colored_message) + log_method(colored_message, exc_info=exc_info)