X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/90aaab77fce2927a47b1f6ceca012d8ed3d399db..36447c488a78017dc533f7ed42bc8cf20c72556d:/nominatim/cli.py diff --git a/nominatim/cli.py b/nominatim/cli.py index 68d3cca8..f8ffe2d2 100644 --- a/nominatim/cli.py +++ b/nominatim/cli.py @@ -90,10 +90,12 @@ class CommandlineParser: args.config = Configuration(args.project_dir, args.data_dir / 'settings') + log = logging.getLogger() + log.warn('Using project directory: %s', str(args.project_dir)) + try: return args.command.run(args) except UsageError as exception: - log = logging.getLogger() if log.isEnabledFor(logging.DEBUG): raise # use Python's exception printing log.fatal('FATAL: %s', exception) @@ -284,6 +286,18 @@ class UpdateReplication: conn.close() return ret + @staticmethod + def _report_update(batchdate, start_import, start_index): + def round_time(delta): + return dt.timedelta(seconds=int(delta.total_seconds())) + + end = dt.datetime.now(dt.timezone.utc) + LOG.warning("Update completed. Import: %s. %sTotal: %s. Remaining backlog: %s.", + round_time((start_index or end) - start_import), + "Indexing: {} ".format(round_time(end - start_index)) + if start_index else '', + round_time(end - start_import), + round_time(end - batchdate)) @staticmethod def _update(args): @@ -317,10 +331,11 @@ class UpdateReplication: start = dt.datetime.now(dt.timezone.utc) state = replication.update(conn, params) status.log_status(conn, start, 'import') + batchdate, _, _ = status.get_status(conn) conn.close() if state is not replication.UpdateState.NO_CHANGES and args.do_index: - start = dt.datetime.now(dt.timezone.utc) + index_start = dt.datetime.now(dt.timezone.utc) indexer = Indexer(args.config.get_libpq_dsn(), args.threads or 1) indexer.index_boundaries(0, 30) @@ -328,8 +343,13 @@ class UpdateReplication: conn = connect(args.config.get_libpq_dsn()) status.set_indexed(conn, True) - status.log_status(conn, start, 'index') + status.log_status(conn, index_start, 'index') conn.close() + else: + index_start = None + + if LOG.isEnabledFor(logging.WARNING): + UpdateReplication._report_update(batchdate, start, index_start) if args.once: break