diff --git a/services/auth.py b/services/auth.py index dd778e68..2e2eb805 100644 --- a/services/auth.py +++ b/services/auth.py @@ -6,7 +6,7 @@ from dogpile.cache import make_region from services.logger import get_colorful_logger from settings import ADMIN_SECRET, AUTH_URL -logger = get_colorful_logger('services.auth') +logger = get_colorful_logger('auth') async def request_data(gql, headers=None): diff --git a/services/db.py b/services/db.py index 303b5c06..99229ec5 100644 --- a/services/db.py +++ b/services/db.py @@ -12,7 +12,7 @@ from sqlalchemy.sql.schema import Table from services.logger import get_colorful_logger from settings import DB_URL -logger = get_colorful_logger('services.db') +logger = get_colorful_logger('db') # Создание региона кэша с TTL 300 секунд cache_region = make_region().configure( diff --git a/services/logger.py b/services/logger.py index 7579513d..95b1024c 100644 --- a/services/logger.py +++ b/services/logger.py @@ -1,7 +1,7 @@ import logging import colorlog -def get_colorful_logger(name): +def get_colorful_logger(name='root'): # Define the color scheme color_scheme = { 'DEBUG': 'light_black', @@ -21,7 +21,7 @@ def get_colorful_logger(name): # Create a ColoredFormatter object for colorized logging formatter = colorlog.ColoredFormatter( - "%(log_color)s%(asctime)s%(asctime)s %(process)s%(process)s %(log_color)s[%(name)s]%(reset)s %(module)s%(module)s %(log_color)s[%(levelname)-8s]%(reset)s %(white)s%(message)s", + "%(log_color)s%(levelname)s: %(log_color)s[%(module)s]%(reset)s %(white)s%(message)s", log_colors=color_scheme, secondary_log_colors=secondary_colors, # Set secondary log colors style='%', diff --git a/services/rediscache.py b/services/rediscache.py index 843ad9b1..03a1cd22 100644 --- a/services/rediscache.py +++ b/services/rediscache.py @@ -3,7 +3,7 @@ import redis.asyncio as aredis from services.logger import get_colorful_logger from settings import REDIS_URL -logger = get_colorful_logger('services.redis') +logger = get_colorful_logger('redis') class RedisCache: diff --git a/services/search.py b/services/search.py index eadde421..7afd4a3f 100644 --- a/services/search.py +++ b/services/search.py @@ -7,9 +7,7 @@ from opensearchpy import OpenSearch from services.logger import get_colorful_logger from services.rediscache import redis -# os_logger = logging.getLogger(name='opensearch') -# os_logger.setLevel(logging.INFO) -logger = get_colorful_logger('services.search') +logger = get_colorful_logger('search') ELASTIC_HOST = os.environ.get('ELASTIC_HOST', '').replace('https://', '') ELASTIC_USER = os.environ.get('ELASTIC_USER', '') diff --git a/services/viewed.py b/services/viewed.py index 27ef6009..491bd708 100644 --- a/services/viewed.py +++ b/services/viewed.py @@ -15,7 +15,7 @@ from orm.topic import Topic from services.db import local_session from services.logger import get_colorful_logger -logger = get_colorful_logger('services.viewed]') +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'