From 2c4b798f9b691ee52b731bfb85f097df64b5ea93 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Tue, 26 Oct 2021 10:57:51 +0200 Subject: [PATCH 1/1] further refactor setup to keep function small --- nominatim/clicmd/setup.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/nominatim/clicmd/setup.py b/nominatim/clicmd/setup.py index 07dacbb4..9a2a73de 100644 --- a/nominatim/clicmd/setup.py +++ b/nominatim/clicmd/setup.py @@ -133,10 +133,7 @@ class SetupAll: with connect(args.config.get_libpq_dsn()) as conn: refresh.setup_website(webdir, args.config, conn) - with connect(args.config.get_libpq_dsn()) as conn: - SetupAll._set_database_date(conn) - properties.set_property(conn, 'database_version', - '{0[0]}.{0[1]}.{0[2]}-{0[3]}'.format(NOMINATIM_VERSION)) + SetupAll._set_database_date(args.config.get_libpq_dsn()) return 0 @@ -199,12 +196,16 @@ class SetupAll: @staticmethod - def _set_database_date(conn): + def _set_database_date(dsn): """ Determine the database date and set the status accordingly. """ - try: - dbdate = status.compute_database_date(conn) - status.set_status(conn, dbdate) - LOG.info('Database is at %s.', dbdate) - except Exception as exc: # pylint: disable=broad-except - LOG.error('Cannot determine date of database: %s', exc) + with connect(dsn) as conn: + try: + dbdate = status.compute_database_date(conn) + status.set_status(conn, dbdate) + LOG.info('Database is at %s.', dbdate) + except Exception as exc: # pylint: disable=broad-except + LOG.error('Cannot determine date of database: %s', exc) + + properties.set_property(conn, 'database_version', + '{0[0]}.{0[1]}.{0[2]}-{0[3]}'.format(NOMINATIM_VERSION)) -- 2.39.5