]> git.openstreetmap.org Git - nominatim.git/commitdiff
API: avoid engine disposal on startup
authorSarah Hoffmann <lonvia@denofr.de>
Tue, 2 Jan 2024 15:10:30 +0000 (16:10 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Tue, 2 Jan 2024 15:10:30 +0000 (16:10 +0100)
nominatim/api/core.py

index 1c0c4423fcae0c6a82d07c39c690bd1b14ffbb47..c0b83f8000fcf1d13c65e76135d5d1732125dd61 100644 (file)
@@ -137,6 +137,10 @@ class NominatimAPIAsync: #pylint: disable=too-many-instance-attributes
                     async with engine.begin() as conn:
                         result = await conn.scalar(sa.text('SHOW server_version_num'))
                         server_version = int(result)
+                        if server_version >= 110000:
+                            await conn.execute(sa.text("SET jit_above_cost TO '-1'"))
+                            await conn.execute(sa.text(
+                                    "SET max_parallel_workers_per_gather TO '0'"))
                 except (PGCORE_ERROR, sa.exc.OperationalError):
                     server_version = 0
 
@@ -146,8 +150,6 @@ class NominatimAPIAsync: #pylint: disable=too-many-instance-attributes
                         cursor = dbapi_con.cursor()
                         cursor.execute("SET jit_above_cost TO '-1'")
                         cursor.execute("SET max_parallel_workers_per_gather TO '0'")
-                    # Make sure that all connections get the new settings
-                    await engine.dispose()
 
             self._property_cache['DB:server_version'] = server_version