From e103b283cb86603a2972da75b18bb21fd489d207 Mon Sep 17 00:00:00 2001 From: Untone Date: Thu, 28 Mar 2024 16:37:04 +0300 Subject: [PATCH] dblog-debug5 --- services/db.py | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/services/db.py b/services/db.py index ba34e4f0..9548cd7f 100644 --- a/services/db.py +++ b/services/db.py @@ -9,8 +9,6 @@ from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm import Session, configure_mappers from sqlalchemy.sql.schema import Table from sqlalchemy_searchable import make_searchable -from sqlalchemy.sql import Executable -from sqlalchemy.dialects.postgresql.psycopg2 import PGExecutionContext from services.logger import root_logger as logger from settings import DB_URL @@ -97,16 +95,12 @@ def before_cursor_execute(conn, cursor, statement, parameters, context, executem @event.listens_for(Engine, 'after_cursor_execute') def after_cursor_execute(conn, cursor, statement, parameters, context, executemany): - if not isinstance(statement, Executable): - return + compiled_statement = context.compiled.string + compiled_parameters = context.compiled.params + if compiled_statement: + elapsed = time.time() - conn.query_start_time + query = compiled_statement % compiled_parameters - if isinstance(context, PGExecutionContext): - compiled_statement = context.compiled.string - compiled_parameters = context.compiled.params - if compiled_statement: - elapsed = time.time() - conn.query_start_time - query = compiled_statement % compiled_parameters - - if elapsed > 1 and conn.last_statement != query: - conn.last_statement = query - logger.debug(f"\n{query}\n{'*' * math.floor(elapsed)} {elapsed:.3f} s\n") + if elapsed > 1 and conn.last_statement != query: + conn.last_statement = query + logger.debug(f"\n{query}\n{'*' * math.floor(elapsed)} {elapsed:.3f} s\n")