|
 |
c8d44ad |
From 1883fa85673c84bad91ccc720cf8618ad26cd652 Mon Sep 17 00:00:00 2001
|
|
|
c8d44ad |
From: Brendan Reilly <breilly@redhat.com>
|
|
|
c8d44ad |
Date: Aug 12 2021 15:50:46 +0000
|
|
|
c8d44ad |
Subject: Update handler name used by SQLAlchemy
|
|
|
c8d44ad |
|
|
|
c8d44ad |
|
|
|
c8d44ad |
---
|
|
|
c8d44ad |
|
|
|
c8d44ad |
diff --git a/module_build_service/common/monitor.py b/module_build_service/common/monitor.py
|
|
|
c8d44ad |
index 7735048..add69b9 100644
|
|
|
c8d44ad |
--- a/module_build_service/common/monitor.py
|
|
|
c8d44ad |
+++ b/module_build_service/common/monitor.py
|
|
|
c8d44ad |
@@ -15,6 +15,7 @@ from prometheus_client import ( # noqa: F401
|
|
|
c8d44ad |
Histogram,
|
|
|
c8d44ad |
start_http_server,
|
|
|
c8d44ad |
)
|
|
|
c8d44ad |
+import sqlalchemy
|
|
|
c8d44ad |
from sqlalchemy import event
|
|
|
c8d44ad |
|
|
|
c8d44ad |
|
|
|
c8d44ad |
@@ -85,9 +86,11 @@ def db_hook_event_listeners(target=None):
|
|
|
c8d44ad |
if not target:
|
|
|
c8d44ad |
target = db.engine
|
|
|
c8d44ad |
|
|
|
c8d44ad |
- @event.listens_for(target, "dbapi_error", named=True)
|
|
|
c8d44ad |
- def receive_dbapi_error(**kw):
|
|
|
c8d44ad |
- db_dbapi_error_counter.inc()
|
|
|
c8d44ad |
+ if sqlalchemy.__version__[0] == "0":
|
|
|
c8d44ad |
+ # Deprecated since 0.9
|
|
|
c8d44ad |
+ @event.listens_for(target, "dbapi_error", named=True)
|
|
|
c8d44ad |
+ def receive_dbapi_error(**kw):
|
|
|
c8d44ad |
+ db_dbapi_error_counter.inc()
|
|
|
c8d44ad |
|
|
|
c8d44ad |
@event.listens_for(target, "engine_connect")
|
|
|
c8d44ad |
def receive_engine_connect(conn, branch):
|
|
|
c8d44ad |
|