From 183755e6376669bfb0e302b8951cfea2c80b78a1 Mon Sep 17 00:00:00 2001 From: Untone Date: Tue, 20 Feb 2024 19:19:46 +0300 Subject: [PATCH] one-logger --- resolvers/author.py | 6 +----- resolvers/community.py | 6 +----- resolvers/editor.py | 5 +---- resolvers/follower.py | 6 +----- resolvers/reaction.py | 5 +---- resolvers/reader.py | 6 +----- resolvers/topic.py | 6 +----- services/auth.py | 5 +---- services/db.py | 4 +--- services/logger.py | 2 ++ services/rediscache.py | 3 +-- services/search.py | 4 +--- services/viewed.py | 3 +-- 13 files changed, 14 insertions(+), 47 deletions(-) diff --git a/resolvers/author.py b/resolvers/author.py index 9e942cb4..e0545fe4 100644 --- a/resolvers/author.py +++ b/resolvers/author.py @@ -1,4 +1,3 @@ -import logging import time from typing import List @@ -18,10 +17,7 @@ from services.db import local_session from services.schema import mutation, query from services.unread import get_total_unread_counter from services.viewed import ViewedStorage - -logging.basicConfig() -logger = logging.getLogger('\t[resolvers.author]\t') -logger.setLevel(logging.DEBUG) +from services.logger import root_logger as logger def add_author_stat_columns(q): diff --git a/resolvers/community.py b/resolvers/community.py index b304bedd..9114873a 100644 --- a/resolvers/community.py +++ b/resolvers/community.py @@ -1,5 +1,3 @@ -import logging - from sqlalchemy import and_, distinct, func, select from sqlalchemy.orm import aliased @@ -8,9 +6,7 @@ from orm.community import Community, CommunityAuthor from orm.shout import ShoutCommunity from services.db import local_session from services.schema import query - -logger = logging.getLogger('\t[resolvers.community]\t') -logger.setLevel(logging.DEBUG) +from services.logger import root_logger as logger def add_community_stat_columns(q): diff --git a/resolvers/editor.py b/resolvers/editor.py index 5c3f812b..ab33af6c 100644 --- a/resolvers/editor.py +++ b/resolvers/editor.py @@ -1,4 +1,3 @@ -import logging import time from sqlalchemy import and_, select @@ -16,9 +15,7 @@ from services.diff import apply_diff, get_diff from services.notify import notify_shout from services.schema import mutation, query from services.search import search_service - -logger = logging.getLogger('[resolver.editor]') -logger.setLevel(logging.DEBUG) +from services.logger import root_logger as logger @query.field('get_shouts_drafts') diff --git a/resolvers/follower.py b/resolvers/follower.py index 63e5d601..87823466 100644 --- a/resolvers/follower.py +++ b/resolvers/follower.py @@ -1,4 +1,3 @@ -import logging from typing import List from sqlalchemy.orm import aliased @@ -15,10 +14,7 @@ from services.auth import login_required from services.db import local_session from services.notify import notify_follower from services.schema import mutation, query - -logging.basicConfig() -logger = logging.getLogger('\t[resolvers.reaction]\t') -logger.setLevel(logging.DEBUG) +from services.logger import root_logger as logger @mutation.field('follow') diff --git a/resolvers/reaction.py b/resolvers/reaction.py index 3bddc8c3..2eaccb44 100644 --- a/resolvers/reaction.py +++ b/resolvers/reaction.py @@ -1,4 +1,3 @@ -import logging import time from typing import List @@ -17,9 +16,7 @@ from services.db import local_session from services.notify import notify_reaction from services.schema import mutation, query from services.viewed import ViewedStorage - -logger = logging.getLogger('\t[resolvers.reaction]\t') -logger.setLevel(logging.DEBUG) +from services.logger import root_logger as logger def add_stat_columns(q, aliased_reaction): diff --git a/resolvers/reader.py b/resolvers/reader.py index 4309bbeb..4c6b1eeb 100644 --- a/resolvers/reader.py +++ b/resolvers/reader.py @@ -1,5 +1,3 @@ -import logging - from sqlalchemy import bindparam, distinct, or_ from sqlalchemy.orm import aliased, joinedload, selectinload from sqlalchemy.sql.expression import and_, asc, case, desc, func, nulls_last, select @@ -16,9 +14,7 @@ from services.db import local_session from services.schema import query from services.search import search_text from services.viewed import ViewedStorage - -logger = logging.getLogger('[resolvers.reader] ') -logger.setLevel(logging.DEBUG) +from services.logger import root_logger as logger def apply_filters(q, filters, author_id=None): diff --git a/resolvers/topic.py b/resolvers/topic.py index 6074dbd8..1441b6c7 100644 --- a/resolvers/topic.py +++ b/resolvers/topic.py @@ -1,5 +1,3 @@ -import logging - from sqlalchemy import and_, distinct, func, select from sqlalchemy.orm import aliased @@ -10,9 +8,7 @@ from services.auth import login_required from services.db import local_session from services.schema import mutation, query from services.viewed import ViewedStorage - -logger = logging.getLogger('\t[resolvers.topic]\t') -logger.setLevel(logging.DEBUG) +from services.logger import root_logger as logger async def followed_topics(follower_id): diff --git a/services/auth.py b/services/auth.py index 2e2eb805..395b71e0 100644 --- a/services/auth.py +++ b/services/auth.py @@ -3,11 +3,8 @@ from functools import wraps import httpx from dogpile.cache import make_region -from services.logger import get_colorful_logger from settings import ADMIN_SECRET, AUTH_URL - -logger = get_colorful_logger('auth') - +from services.logger import root_logger as logger async def request_data(gql, headers=None): if headers is None: diff --git a/services/db.py b/services/db.py index 99229ec5..25de7b57 100644 --- a/services/db.py +++ b/services/db.py @@ -9,11 +9,9 @@ from sqlalchemy.engine import Engine from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm import Session from sqlalchemy.sql.schema import Table -from services.logger import get_colorful_logger +from services.logger import root_logger as logger from settings import DB_URL -logger = get_colorful_logger('db') - # Создание региона кэша с TTL 300 секунд cache_region = make_region().configure( 'dogpile.cache.memory', diff --git a/services/logger.py b/services/logger.py index 95b1024c..5ec288c1 100644 --- a/services/logger.py +++ b/services/logger.py @@ -38,3 +38,5 @@ def get_colorful_logger(name='root'): logger.addHandler(stream) return logger + +root_logger = get_colorful_logger() diff --git a/services/rediscache.py b/services/rediscache.py index 03a1cd22..c228f28a 100644 --- a/services/rediscache.py +++ b/services/rediscache.py @@ -1,9 +1,8 @@ import redis.asyncio as aredis -from services.logger import get_colorful_logger +from services.logger import root_logger as logger from settings import REDIS_URL -logger = get_colorful_logger('redis') class RedisCache: diff --git a/services/search.py b/services/search.py index 7afd4a3f..4452951d 100644 --- a/services/search.py +++ b/services/search.py @@ -4,11 +4,9 @@ from multiprocessing import Manager from opensearchpy import OpenSearch -from services.logger import get_colorful_logger +from services.logger import root_logger as logger from services.rediscache import redis -logger = get_colorful_logger('search') - ELASTIC_HOST = os.environ.get('ELASTIC_HOST', '').replace('https://', '') ELASTIC_USER = os.environ.get('ELASTIC_USER', '') ELASTIC_PASSWORD = os.environ.get('ELASTIC_PASSWORD', '') diff --git a/services/viewed.py b/services/viewed.py index 491bd708..b66e9db9 100644 --- a/services/viewed.py +++ b/services/viewed.py @@ -13,9 +13,8 @@ from orm.author import Author from orm.shout import Shout, ShoutAuthor, ShoutTopic from orm.topic import Topic from services.db import local_session -from services.logger import get_colorful_logger +from services.logger import root_logger as logger -logger = get_colorful_logger('viewed') GOOGLE_KEYFILE_PATH = os.environ.get('GOOGLE_KEYFILE_PATH', '/dump/google-service.json') GOOGLE_PROPERTY_ID = os.environ.get('GOOGLE_PROPERTY_ID', '') VIEWS_FILEPATH = '/dump/views.json'