From b5cdface639dcf51211d39d61fa5fbd76811ed5e Mon Sep 17 00:00:00 2001
From: Untone <anton.rewin@gmail.com>
Date: Tue, 20 Feb 2024 18:28:38 +0300
Subject: [PATCH] logger-fix

---
 services/rediscache.py | 6 ++----
 services/search.py     | 9 ++++-----
 services/viewed.py     | 8 ++------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/services/rediscache.py b/services/rediscache.py
index 661b1dc7..843ad9b1 100644
--- a/services/rediscache.py
+++ b/services/rediscache.py
@@ -1,11 +1,9 @@
-import logging
-
 import redis.asyncio as aredis
 
+from services.logger import get_colorful_logger
 from settings import REDIS_URL
 
-logger = logging.getLogger('[services.redis] ')
-logger.setLevel(logging.DEBUG)
+logger = get_colorful_logger('services.redis')
 
 
 class RedisCache:
diff --git a/services/search.py b/services/search.py
index c7e26051..4710e105 100644
--- a/services/search.py
+++ b/services/search.py
@@ -1,16 +1,15 @@
 import json
-import logging
 import os
 from multiprocessing import Manager
 
 from opensearchpy import OpenSearch
 
+from servies.logger import get_colorful_logger
 from services.rediscache import redis
 
-os_logger = logging.getLogger(name='opensearch')
-os_logger.setLevel(logging.INFO)
-logger = logging.getLogger('\t[services.search]\t')
-logger.setLevel(logging.DEBUG)
+# os_logger = logging.getLogger(name='opensearch')
+# os_logger.setLevel(logging.INFO)
+logger = get_colorful_logger('services.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 cad4e6b7..27ef6009 100644
--- a/services/viewed.py
+++ b/services/viewed.py
@@ -1,6 +1,5 @@
 import asyncio
 import json
-import logging
 import os
 import time
 from datetime import datetime, timedelta, timezone
@@ -14,12 +13,9 @@ 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
 
-# Настройка журналирования
-logging.basicConfig(level=logging.DEBUG)
-logger = logging.getLogger('\t[services.viewed]\t')
-logger.setLevel(logging.DEBUG)
-
+logger = get_colorful_logger('services.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'