Merge pull request #3064 from lonvia/clicmd-debug-output

[nominatim.git] / nominatim / cli.py

diff --git a/nominatim/cli.py b/nominatim/cli.py
index 7143b7d676c6d9aafa8c5f5aa9f7cbf71813d08c..d34ef118ed9a48609c455616207d36387e006802 100644 (file)
--- a/nominatim/cli.py
+++ b/nominatim/cli.py
@@ -9,6 +9,7 @@ Command-line interface to the Nominatim functions for import, update,
 database administration and querying.
 """
 from typing import Optional, Any, List, Union
 database administration and querying.
 """
 from typing import Optional, Any, List, Union

+import importlib

 import logging
 import os
 import sys
 import logging
 import os
 import sys


@@ -60,7 +61,7 @@ class CommandlineParser:
     def nominatim_version_text(self) -> str:
         """ Program name and version number as string
         """
     def nominatim_version_text(self) -> str:
         """ Program name and version number as string
         """

-        text = f'Nominatim version {version.version_str()}'
+        text = f'Nominatim version {version.NOMINATIM_VERSION!s}'

         if version.GIT_COMMIT_HASH is not None:
             text += f' ({version.GIT_COMMIT_HASH})'
         return text
         if version.GIT_COMMIT_HASH is not None:
             text += f' ({version.GIT_COMMIT_HASH})'
         return text


@@ -232,17 +233,17 @@ class AdminServe:
                 port = 8088
 
             if args.engine == 'sanic':
                 port = 8088
 
             if args.engine == 'sanic':

-                import nominatim.server.sanic.server
+                server_module = importlib.import_module('nominatim.server.sanic.server')

 
 

-                app = nominatim.server.sanic.server.get_application(args.project_dir)
-                app.run(host=host, port=port, debug=True)
+                app = server_module.get_application(args.project_dir)
+                app.run(host=host, port=port, debug=True, single_process=True)

             else:
             else:

-                import uvicorn
+                import uvicorn # pylint: disable=import-outside-toplevel

 
                 if args.engine == 'falcon':
 
                 if args.engine == 'falcon':

-                    import nominatim.server.falcon.server as server_module
+                    server_module = importlib.import_module('nominatim.server.falcon.server')

                 elif args.engine == 'starlette':
                 elif args.engine == 'starlette':

-                    import nominatim.server.starlette.server as server_module
+                    server_module = importlib.import_module('nominatim.server.starlette.server')

 
                 app = server_module.get_application(args.project_dir)
                 uvicorn.run(app, host=host, port=port)
 
                 app = server_module.get_application(args.project_dir)
                 uvicorn.run(app, host=host, port=port)