From 2e2eba68a285bc395759a6546ecd636e5fc132ce Mon Sep 17 00:00:00 2001 From: Untone Date: Fri, 23 Feb 2024 15:02:14 +0300 Subject: [PATCH] db-adapter-fixes --- services/auth.py | 4 ++-- services/db.py | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/services/auth.py b/services/auth.py index defae35a..1da9a72b 100644 --- a/services/auth.py +++ b/services/auth.py @@ -22,7 +22,7 @@ async def request_data(gql, headers=None): return data except Exception as e: # Handling and logging exceptions during authentication check - logger.error(f'[services.auth] request_data error: {e}') + logger.error(f'request_data error: {e}') return None @@ -60,7 +60,7 @@ async def check_auth(req): async def add_user_role(user_id): - logger.info(f'[services.auth] add author role for user_id: {user_id}') + logger.info(f'add author role for user_id: {user_id}') query_name = '_update_user' operation = 'UpdateUserRoles' headers = { diff --git a/services/db.py b/services/db.py index 14884505..1592a276 100644 --- a/services/db.py +++ b/services/db.py @@ -19,20 +19,19 @@ cache_region = make_region().configure('dogpile.cache.memory', expiration_time=3 engine = create_engine(DB_URL, echo=False, pool_size=10, max_overflow=20) T = TypeVar('T') REGISTRY: Dict[str, type] = {} -Base = declarative_base() # Перехватчики для журнала запросов SQLAlchemy @event.listens_for(Engine, 'before_cursor_execute') def before_cursor_execute(conn, cursor, statement, parameters, context, executemany): - conn._query_start_time = time.time() + conn.query_start_time = time.time() @event.listens_for(Engine, 'after_cursor_execute') def after_cursor_execute(conn, cursor, statement, parameters, context, executemany): if hasattr(conn, '_query_start_time'): - elapsed = time.time() - conn._query_start_time - del conn._query_start_time + elapsed = time.time() - conn.query_start_time + del conn.query_start_time if elapsed > 0.9: # Adjust threshold as needed logger.debug( f"\n{statement}\n{'*' * math.floor(elapsed)} {elapsed:.3f} s"