Merge branch '3.0' into image-md5sum-management

This commit is contained in:
Jeremy Grossmann authored and GitHub committed 2022-04-18 17:15:21 +07:00
commit b94f01fe4e
3 files changed
+13 -2

No files matched your search

+3
View File
@@ -26,6 +26,7 @@ from gns3server.compute.port_manager import PortManager
from gns3server.utils.http_client import HTTPClient
from gns3server.db.tasks import connect_to_db, get_computes, discover_images_on_filesystem
import logging
log = logging.getLogger(__name__)
@@ -91,4 +92,6 @@ def create_shutdown_handler(app: FastAPI) -> Callable:
if PortManager.instance().udp_ports:
log.warning(f"UDP ports are still used {PortManager.instance().udp_ports}")
await disconnect_from_db(app)
return shutdown_handler
+8
View File
@@ -55,6 +55,14 @@ async def connect_to_db(app: FastAPI) -> None:
log.fatal(f"Error while connecting to database '{db_url}: {e}")
async def disconnect_from_db(app: FastAPI) -> None:
# dispose of the connection pool used by the database engine
if getattr(app.state, "_db_engine"):
await app.state._db_engine.dispose()
log.info(f"Disconnected from database")
@event.listens_for(Engine, "connect")
def set_sqlite_pragma(dbapi_connection, connection_record):