Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / clicmd / admin.py

diff --git a/nominatim/clicmd/admin.py b/nominatim/clicmd/admin.py
index 06a61974db1c6db5d52d37555d2a67afbbdcf648..c3ba9c0b3ea2b9b2f7e546fd567aac3559debfe2 100644 (file)
--- a/nominatim/clicmd/admin.py
+++ b/nominatim/clicmd/admin.py
@@ -1,10 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# This file is part of Nominatim. (https://nominatim.org)
+#
+# Copyright (C) 2022 by the Nominatim developer community.
+# For a full list of authors see the git log.

 """
 Implementation of the 'admin' subcommand.
 """
 import logging
 """
 Implementation of the 'admin' subcommand.
 """
 import logging

+import argparse

 
 from nominatim.tools.exec_utils import run_legacy_script
 
 from nominatim.tools.exec_utils import run_legacy_script

-from nominatim.db.connection import connect
+from nominatim.clicmd.args import NominatimArgs

 
 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111
 
 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111


@@ -13,13 +20,13 @@ from nominatim.db.connection import connect
 
 LOG = logging.getLogger()
 
 
 LOG = logging.getLogger()
 

+

 class AdminFuncs:
     """\
     Analyse and maintain the database.
     """
 
 class AdminFuncs:
     """\
     Analyse and maintain the database.
     """
 

-    @staticmethod
-    def add_args(parser):
+    def add_args(self, parser: argparse.ArgumentParser) -> None:

         group = parser.add_argument_group('Admin tasks')
         objs = group.add_mutually_exclusive_group(required=True)
         objs.add_argument('--warm', action='store_true',
         group = parser.add_argument_group('Admin tasks')
         objs = group.add_mutually_exclusive_group(required=True)
         objs.add_argument('--warm', action='store_true',


@@ -30,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')
                           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',
         group = parser.add_argument_group('Arguments for cache warming')
         group.add_argument('--search-only', action='store_const', dest='target',
                            const='search',


@@ -44,10 +53,9 @@ class AdminFuncs:
         mgroup.add_argument('--place-id', type=int,
                             help='Analyse indexing of the given Nominatim object')
 
         mgroup.add_argument('--place-id', type=int,
                             help='Analyse indexing of the given Nominatim object')
 

-    @staticmethod
-    def run(args):
+    def run(self, args: NominatimArgs) -> int:

         if args.warm:
         if args.warm:

-            return AdminFuncs._warm(args)
+            return self._warm(args)

 
         if args.check_database:
             LOG.warning('Checking database')
 
         if args.check_database:
             LOG.warning('Checking database')


@@ -57,8 +65,7 @@ class AdminFuncs:
         if args.analyse_indexing:
             LOG.warning('Analysing performance of indexing function')
             from ..tools import admin
         if args.analyse_indexing:
             LOG.warning('Analysing performance of indexing function')
             from ..tools import admin

-            with connect(args.config.get_libpq_dsn()) as conn:
-                admin.analyse_indexing(conn, osm_id=args.osm_id, place_id=args.place_id)
+            admin.analyse_indexing(args.config, osm_id=args.osm_id, place_id=args.place_id)

             return 0
 
         if args.migrate:
             return 0
 
         if args.migrate:


@@ -66,11 +73,15 @@ class AdminFuncs:
             from ..tools import migration
             return migration.migrate(args.config, args)
 
             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

 
 

-    @staticmethod
-    def _warm(args):
+    def _warm(self, args: NominatimArgs) -> int:

         LOG.warning('Warming database caches')
         params = ['warm.php']
         if args.target == 'reverse':
         LOG.warning('Warming database caches')
         params = ['warm.php']
         if args.target == 'reverse':