diff --git a/bz1968843.patch b/bz1968843.patch new file mode 100644 index 0000000..f4b7435 --- /dev/null +++ b/bz1968843.patch @@ -0,0 +1,36 @@ +From 1883fa85673c84bad91ccc720cf8618ad26cd652 Mon Sep 17 00:00:00 2001 +From: Brendan Reilly +Date: Aug 12 2021 15:50:46 +0000 +Subject: Update handler name used by SQLAlchemy + + +--- + +diff --git a/module_build_service/common/monitor.py b/module_build_service/common/monitor.py +index 7735048..add69b9 100644 +--- a/module_build_service/common/monitor.py ++++ b/module_build_service/common/monitor.py +@@ -15,6 +15,7 @@ from prometheus_client import ( # noqa: F401 + Histogram, + start_http_server, + ) ++import sqlalchemy + from sqlalchemy import event + + +@@ -85,9 +86,11 @@ def db_hook_event_listeners(target=None): + if not target: + target = db.engine + +- @event.listens_for(target, "dbapi_error", named=True) +- def receive_dbapi_error(**kw): +- db_dbapi_error_counter.inc() ++ if sqlalchemy.__version__[0] == "0": ++ # Deprecated since 0.9 ++ @event.listens_for(target, "dbapi_error", named=True) ++ def receive_dbapi_error(**kw): ++ db_dbapi_error_counter.inc() + + @event.listens_for(target, "engine_connect") + def receive_engine_connect(conn, branch): + diff --git a/module-build-service.spec b/module-build-service.spec index d7a70b0..3ec20d4 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -11,6 +11,7 @@ Summary: The Module Build Service for Modularity License: MIT URL: https://pagure.io/fm-orchestrator Source0: https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz +Patch0: bz1968843.patch BuildArch: noarch @@ -204,6 +205,7 @@ for a number of tasks: %prep %setup -q +%patch0 -p1 # Workaround because python2-koji has no egg-info file at the momement