mirror of
https://src.fedoraproject.org/rpms/module-build-service.git
synced 2026-11-06 07:57:22 +08:00
Add patch to fix BZ 1968843
This commit is contained in:
36
bz1968843.patch
Normal file
36
bz1968843.patch
Normal file
@@ -0,0 +1,36 @@
|
||||
From 1883fa85673c84bad91ccc720cf8618ad26cd652 Mon Sep 17 00:00:00 2001
|
||||
From: Brendan Reilly <breilly@redhat.com>
|
||||
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):
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user