From 64141166f1987fc3fed9da797b45c1928e15cf58 Mon Sep 17 00:00:00 2001 From: Taka Date: Fri, 20 Mar 2020 05:35:09 +0000 Subject: [PATCH] Show startup warnings in the UI. --- asl_articles/search.py | 15 ++++++++++++--- asl_articles/startup.py | 7 ++++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/asl_articles/search.py b/asl_articles/search.py index ece5b42..117b431 100644 --- a/asl_articles/search.py +++ b/asl_articles/search.py @@ -436,13 +436,19 @@ def init_search( session, logger ): global _search_weights for row in get_section( "Search weights" ): if row[0] not in _SEARCHABLE_COL_NAMES: - _logger.warning( "- Unknown search weight field: %s", row[0] ) + asl_articles.startup.log_startup_msg( "warning", + "Unknown search weight field: {}", row[0], + logger = _logger + ) continue try: _search_weights[ row[0] ] = float( row[1] ) _logger.debug( "- %s = %s", row[0], row[1] ) except ValueError: - _logger.warning( "- Invalid search weight for \"%s\": %s", row[0], row[1] ) + asl_articles.startup.log_startup_msg( "warning", + "Invalid search weight for \"{}\": {}", row[0], row[1], + logger = _logger + ) def _load_search_aliases( aliases, aliases2 ): """Load the search aliases.""" @@ -452,7 +458,10 @@ def _load_search_aliases( aliases, aliases2 ): def add_search_alias( key, vals ): if key in search_aliases: - _logger.warning( "Found duplicate search alias: %s", key ) + asl_articles.startup.log_startup_msg( "warning", + "Found duplicate search alias: {}", key, + logger = _logger + ) search_aliases[ key ] =vals # load the search aliases diff --git a/asl_articles/startup.py b/asl_articles/startup.py index b1541b0..52a1ac4 100644 --- a/asl_articles/startup.py +++ b/asl_articles/startup.py @@ -19,4 +19,9 @@ def get_startup_msgs(): def log_startup_msg( msg_type, msg, *args, **kwargs ): """Log a startup message.""" - _startup_msgs[ msg_type ].append( msg.format( *args, **kwargs ) ) + logger = kwargs.pop( "logger", None ) + msg = msg.format( *args, **kwargs ) + if logger: + assert msg_type in ("info","warning","error") + getattr( logger, msg_type )( "%s", msg ) + _startup_msgs[ msg_type ].append( msg )