From 465d82a92fd10b727db6aab68b47099dd126d8f6 Mon Sep 17 00:00:00 2001 From: Tareq Al-Ahdal Date: Sat, 13 Aug 2022 06:18:10 +0800 Subject: [PATCH 1/1] Integrated 'collect_os_info.py' into Nominatim's CLI tool --- nominatim/clicmd/admin.py | 10 +++++++++- nominatim/clicmd/args.py | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/nominatim/clicmd/admin.py b/nominatim/clicmd/admin.py index ad900579..c3ba9c0b 100644 --- a/nominatim/clicmd/admin.py +++ b/nominatim/clicmd/admin.py @@ -20,6 +20,7 @@ from nominatim.clicmd.args import NominatimArgs LOG = logging.getLogger() + class AdminFuncs: """\ Analyse and maintain the database. @@ -36,6 +37,8 @@ class AdminFuncs: help='Migrate the database to a new software version') objs.add_argument('--analyse-indexing', action='store_true', help='Print performance analysis of the indexing process') + objs.add_argument('--collect-os-info', action="store_true", + help="Generate a report about the host system information") group = parser.add_argument_group('Arguments for cache warming') group.add_argument('--search-only', action='store_const', dest='target', const='search', @@ -70,8 +73,13 @@ class AdminFuncs: from ..tools import migration return migration.migrate(args.config, args) - return 1 + if args.collect_os_info: + LOG.warning("Reporting System Information") + from ..tools import collect_os_info + collect_os_info.report_system_information(args.config) + return 0 + return 1 def _warm(self, args: NominatimArgs) -> int: LOG.warning('Warming database caches') diff --git a/nominatim/clicmd/args.py b/nominatim/clicmd/args.py index c976f394..4457db5f 100644 --- a/nominatim/clicmd/args.py +++ b/nominatim/clicmd/args.py @@ -76,6 +76,7 @@ class NominatimArgs: warm: bool check_database: bool migrate: bool + collect_os_info: bool analyse_indexing: bool target: Optional[str] osm_id: Optional[str] -- 2.45.2