From 20cc14adc618680d74e7f98f1e6bec577d327c91 Mon Sep 17 00:00:00 2001 From: Untone Date: Mon, 11 Mar 2024 11:16:12 +0300 Subject: [PATCH] debug-follow --- resolvers/author.py | 4 ++-- resolvers/editor.py | 19 ++++++------------- resolvers/follower.py | 1 + services/auth.py | 7 ------- services/logger.py | 5 +++++ 5 files changed, 14 insertions(+), 22 deletions(-) diff --git a/resolvers/author.py b/resolvers/author.py index d5e59a38..0df80de6 100644 --- a/resolvers/author.py +++ b/resolvers/author.py @@ -86,7 +86,7 @@ async def get_author_by_user_id(user_id: str): author_id = author.get('id') author_slug = author.get('slug') if author_id: - logger.debug(f'got author @{author_slug} #{author_id} cached today') + logger.debug(f'got author @{author_slug} #{author_id} cached') return author q = select(Author).filter(Author.user == user_id) @@ -278,7 +278,7 @@ async def get_author_followers(_, _info, slug: str): logger.debug(f'@{slug} cache updated with {len(results)} followers') return results else: - logger.debug(f'@{slug} got followers cached today') + logger.debug(f'@{slug} got followers cached') return json.loads(cached) except Exception as exc: import traceback diff --git a/resolvers/editor.py b/resolvers/editor.py index 2cc9a4ab..02f2ebc4 100644 --- a/resolvers/editor.py +++ b/resolvers/editor.py @@ -223,23 +223,13 @@ async def update_shout(_, info, shout_id: int, shout_input=None, publish=False): shout_by_id = session.query(Shout).filter(Shout.id == shout_id).first() if not shout_by_id: return {'error': 'shout not found'} - if shout_by_id and slug != shout_by_id.slug: - same_slug_shout = ( - session.query(Shout) - .filter(Shout.slug == shout_input.get('slug')) - .first() - ) + if slug != shout_by_id.slug: + same_slug_shout = session.query(Shout).filter(Shout.slug == slug).first() c = 1 while same_slug_shout is not None: c += 1 slug += f'-{c}' - same_slug_shout = ( - session.query(Shout) - .filter( - Shout.slug == slug - ) # Use the updated slug value here - .first() - ) + same_slug_shout = session.query(Shout).filter(Shout.slug == slug).first() shout_input['slug'] = slug if ( @@ -279,6 +269,9 @@ async def update_shout(_, info, shout_id: int, shout_input=None, publish=False): return {'error': 'access denied', 'shout': None} except Exception as exc: + import traceback + + traceback.print_exc() logger.error(exc) logger.error(f' cannot update with data: {shout_input}') diff --git a/resolvers/follower.py b/resolvers/follower.py index d998e767..58e1081c 100644 --- a/resolvers/follower.py +++ b/resolvers/follower.py @@ -31,6 +31,7 @@ from services.rediscache import redis @login_required async def follow(_, info, what, slug): follows = None + logger.debug(info.context['request']) try: user_id = info.context['user_id'] follower_query = ( diff --git a/services/auth.py b/services/auth.py index 44b70298..05124578 100644 --- a/services/auth.py +++ b/services/auth.py @@ -1,17 +1,10 @@ from functools import wraps import httpx -import logging from starlette.exceptions import HTTPException from services.logger import root_logger as logger from settings import ADMIN_SECRET, AUTH_URL -trace_logger = logging.getLogger('_trace') -trace_logger.setLevel(logging.INFO) - -httpx_logger = logging.getLogger('httpx') -httpx_logger.setLevel(logging.INFO) - async def request_data(gql, headers=None): if headers is None: diff --git a/services/logger.py b/services/logger.py index f8260ec1..b312999c 100644 --- a/services/logger.py +++ b/services/logger.py @@ -69,3 +69,8 @@ def get_colorful_logger(name='main'): root_logger = logging.getLogger() root_logger.setLevel(logging.DEBUG) root_logger.addHandler(stream) + +ignore_logs = ['_trace', 'httpx', '_client', '_trace.atrace', 'aiohttp', '_client'] +for lgr in ignore_logs: + loggr = logging.getLogger(lgr) + loggr.setLevel(logging.INFO)