one-logger

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
-
+from services.logger import root_logger as logger
-logging.basicConfig()
-logger = logging.getLogger('\t[resolvers.author]\t')
-logger.setLevel(logging.DEBUG)
 
 
 def add_author_stat_columns(q):

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
-
+from services.logger import root_logger as logger
-logger = logging.getLogger('\t[resolvers.community]\t')
-logger.setLevel(logging.DEBUG)
 
 
 def add_community_stat_columns(q):

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
-
+from services.logger import root_logger as logger
-logger = logging.getLogger('[resolver.editor]')
-logger.setLevel(logging.DEBUG)
 
 
 @query.field('get_shouts_drafts')

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
-
+from services.logger import root_logger as logger
-logging.basicConfig()
-logger = logging.getLogger('\t[resolvers.reaction]\t')
-logger.setLevel(logging.DEBUG)
 
 
 @mutation.field('follow')

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
-
+from services.logger import root_logger as logger
-logger = logging.getLogger('\t[resolvers.reaction]\t')
-logger.setLevel(logging.DEBUG)
 
 
 def add_stat_columns(q, aliased_reaction):

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
-
+from services.logger import root_logger as logger
-logger = logging.getLogger('[resolvers.reader] ')
-logger.setLevel(logging.DEBUG)
 
 
 def apply_filters(q, filters, author_id=None):

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
-
+from services.logger import root_logger as logger
-logger = logging.getLogger('\t[resolvers.topic]\t')
-logger.setLevel(logging.DEBUG)
 
 
 async def followed_topics(follower_id):

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
-
+from services.logger import root_logger as logger
-logger = get_colorful_logger('auth')
-
 
 async def request_data(gql, headers=None):
     if headers is None:

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',

services/logger.py

@@ -38,3 +38,5 @@ def get_colorful_logger(name='root'):
     logger.addHandler(stream)
 
     return logger
+
+root_logger = get_colorful_logger()

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:

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', '')

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'