rework logging and get_root_logger

HadronCollider · HadronCollider · commit cd36c3bade0c · 2024-04-21T23:54:16.000+03:00
diff --git a/app/api/audio.py b/app/api/audio.py
@@ -1,4 +1,4 @@
-import logging
+from app.root_logger import get_root_logger
 
 from bson import ObjectId
 from flask import Blueprint
@@ -9,7 +9,8 @@
 from app.utils import check_arguments_are_convertible_to_object_id
 
 api_audio = Blueprint('api_audio', __name__)
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 
 @check_arguments_are_convertible_to_object_id
diff --git a/app/api/criteria.py b/app/api/criteria.py
@@ -1,6 +1,5 @@
 from bson import ObjectId
 from flask import Blueprint, request
-import logging
 from json import dumps
 
 from app.check_access import check_access
diff --git a/app/api/dump.py b/app/api/dump.py
@@ -1,6 +1,6 @@
 from flask import Blueprint, send_file
 from datetime import datetime
-import logging
+from app.root_logger import get_root_logger
 import os
 import subprocess
 from werkzeug.utils import secure_filename
@@ -10,7 +10,8 @@
 
 
 api_dump = Blueprint('api_dump', __name__)
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 backup_filenames = ('backup.zip', 'backup_nochunks.zip')
 
diff --git a/app/api/files.py b/app/api/files.py
@@ -1,4 +1,4 @@
-import logging
+from app.root_logger import get_root_logger
 
 from bson import ObjectId
 from flask import Blueprint, make_response, request, send_file, session
@@ -11,7 +11,8 @@
     check_arguments_are_convertible_to_object_id, convert_to_pdf, is_convertible
 
 api_files = Blueprint('api_files', __name__)
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 @check_arguments_are_convertible_to_object_id
 @api_files.route('/api/files/presentation-records/<presentation_record_file_id>/', methods=['GET'])
diff --git a/app/api/logs.py b/app/api/logs.py
@@ -1,5 +1,5 @@
 from  datetime import datetime
-import logging
+from app.root_logger import get_root_logger
 from ast import literal_eval
 
 from flask import Blueprint, request
@@ -8,7 +8,8 @@
 from app.mongo_odm import LogsDBManager
 
 api_logs = Blueprint('api_logs', __name__)
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 
 @api_logs.route('/api/logs/', methods=['GET'])
diff --git a/app/api/presentations.py b/app/api/presentations.py
@@ -1,4 +1,4 @@
-import logging
+from app.root_logger import get_root_logger
 
 from flask import Blueprint
 
@@ -8,7 +8,8 @@
 from app.utils import check_arguments_are_convertible_to_object_id
 
 api_presentations = Blueprint('api_presentations', __name__)
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 
 def get_presentation_information(current_presentation_file: PresentationFiles) -> dict:
diff --git a/app/api/sessions.py b/app/api/sessions.py
@@ -1,4 +1,4 @@
-import logging
+from app.root_logger import get_root_logger
 
 from flask import Blueprint, request, session
 
@@ -9,7 +9,8 @@
 from ua_parser.user_agent_parser import Parse as user_agent_parse
 
 api_sessions = Blueprint('api_sessions', __name__)
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 
 @api_sessions.route('/api/sessions/info/', methods=['GET'])
diff --git a/app/api/task_attempts.py b/app/api/task_attempts.py
@@ -1,4 +1,4 @@
-import logging
+from app.root_logger import get_root_logger
 
 from bson import ObjectId
 from flask import session, request, Blueprint
@@ -9,7 +9,8 @@
 from app.utils import check_arguments_are_convertible_to_object_id, check_argument_is_convertible_to_object_id
 
 api_task_attempts = Blueprint('api_task_attempts', __name__)
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 
 @check_arguments_are_convertible_to_object_id
diff --git a/app/api/trainings.py b/app/api/trainings.py
@@ -1,4 +1,4 @@
-import logging
+from app.root_logger import get_root_logger
 import time
 import json
 import os
@@ -20,7 +20,8 @@
 from app.localisation import *
 
 api_trainings = Blueprint('api_trainings', __name__)
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 
 @check_arguments_are_convertible_to_object_id
diff --git a/app/api/version.py b/app/api/version.py
@@ -1,4 +1,4 @@
-import logging
+from app.root_logger import get_root_logger
 from flask import render_template, Blueprint
 from app.lti_session_passback.auth_checkers import check_admin
 import os
@@ -7,7 +7,8 @@
 from app.config import Config
 
 api_version = Blueprint('api_version', __name__)
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 
 @api_version.route('/api/version/info/', methods=['GET'])
diff --git a/app/criteria/slides_checker/criterion.py b/app/criteria/slides_checker/criterion.py
@@ -1,4 +1,4 @@
-import logging
+from app.root_logger import get_root_logger
 import requests
 import time
 import traceback
@@ -12,7 +12,8 @@
 from lti.tool_consumer import ToolConsumer
 
 
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 
 class SlidesCheckerCriterion(BaseCriterion):
diff --git a/app/criteria/utils.py b/app/criteria/utils.py
@@ -1,4 +1,4 @@
-import logging
+from app.root_logger import get_root_logger
 import math
 import traceback
 from typing import Optional, Callable
@@ -7,6 +7,7 @@
 from app.audio import Audio
 from app.utils import get_types
 
+logger = get_root_logger()
 
 def check_criterions(criterions):
     try:
@@ -18,7 +19,7 @@ def check_criterions(criterions):
             criterion, msg = create_empty_criterion_by_structure(
                 criterion_class, structure)
             if not criterion:
-                logging.error(
+                logger.error(
                     f"Can't create instance of {criterion_name} with structure {structure}. Error message: {msg}")
                 all_ok = False
                 continue
diff --git a/app/criteria_pack/criterion_pack_base.py b/app/criteria_pack/criterion_pack_base.py
@@ -1,9 +1,10 @@
 from app.criteria import CRITERIONS
-import logging
+from app.root_logger import get_root_logger
 from app.localisation import *
 from app.mongo_odm import CriterionDBManager, TrainingsDBManager
 
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 
 class BaseCriterionPack:
diff --git a/app/filters.py b/app/filters.py
@@ -1,4 +1,4 @@
-import logging
+from app.root_logger import get_root_logger
 import math
 import re
 import pytz
@@ -10,7 +10,8 @@
 from app.mongo_odm import TrainingsDBManager, TaskAttemptsDBManager
 from app.status import TrainingStatus, AudioStatus, PresentationStatus, PassBackStatus
 
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 
 class GetAllTrainingsFilterManager():
diff --git a/app/mongo_odm.py b/app/mongo_odm.py
@@ -1,4 +1,4 @@
-import logging
+from app.root_logger import get_root_logger
 import os
 import time
 import uuid
@@ -28,7 +28,8 @@
                         TrainingStatus)
 from app.utils import remove_blank_and_none
 
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 
 class DBManager:
diff --git a/app/root_logger.py b/app/root_logger.py
@@ -2,7 +2,6 @@
 import sys
 from datetime import datetime
 
-from app.mongo_odm import LogsDBManager
 from app.utils import is_testing_active
 
 
@@ -15,6 +14,7 @@ def __init__(self, service_name):
     def emit(self, record):
         if not record.msg or is_testing_active():
             return
+        from app.mongo_odm import LogsDBManager
         LogsDBManager().add_log(timestamp=datetime.now(),
                                 serviceName=self.service_name,
                                 levelname=record.levelname,
@@ -34,10 +34,11 @@ def get_logging_stdout_handler():
     return logging_stdout_handler
 
 
-def get_root_logger(service_name):
+def get_root_logger(service_name='root_logger'):
     root_logger = logging.getLogger('root_logger')
     root_logger.setLevel(logging.DEBUG)
-    root_logger.addHandler(get_logging_stdout_handler())
-    root_logger.addHandler(MongoDBLoggingHandler(service_name))
+    if not root_logger.hasHandlers():
+        root_logger.addHandler(get_logging_stdout_handler())
+        root_logger.addHandler(MongoDBLoggingHandler(service_name))
     root_logger.propagate = False
     return root_logger
diff --git a/app/routes/admin.py b/app/routes/admin.py
@@ -1,4 +1,4 @@
-import logging
+from app.root_logger import get_root_logger
 
 from flask import render_template, redirect, Blueprint
 from flask.helpers import url_for 
@@ -7,7 +7,8 @@
 from app.lti_session_passback.auth_checkers import check_admin
 
 routes_admin = Blueprint('routes_admin', __name__)
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 
 @routes_admin.route('/admin/', methods=['GET'])
diff --git a/app/routes/criterions.py b/app/routes/criterions.py
@@ -1,5 +1,5 @@
 from flask import render_template, Blueprint
-import logging
+from app.root_logger import get_root_logger
 from json import dumps
 
 from app.api.criteria import CRITERIONS, get_all_criterions
@@ -9,7 +9,8 @@
 
 routes_criterion = Blueprint(
     'routes_criterion', __name__, url_prefix='/criterion')
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 
 @routes_criterion.route('/create/', methods=['GET'])
diff --git a/app/routes/lti.py b/app/routes/lti.py
@@ -1,4 +1,4 @@
-import logging
+from app.root_logger import get_root_logger
 from app.criteria_pack import CriteriaPackFactory
 from bson.objectid import ObjectId
 
@@ -10,7 +10,8 @@
 from app.utils import ALLOWED_EXTENSIONS, DEFAULT_EXTENSION, check_argument_is_convertible_to_object_id
 
 routes_lti = Blueprint('routes_lti', __name__)
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 
 @routes_lti.route('/lti', methods=['POST'])
diff --git a/app/routes/packs.py b/app/routes/packs.py
@@ -1,4 +1,4 @@
-import logging
+from app.root_logger import get_root_logger
 from json import dumps
 
 from app.api.criteria_pack import get_all_criterion_packs
@@ -8,7 +8,8 @@
 
 routes_criteria_pack = Blueprint(
     'routes_criteria_pack', __name__, url_prefix='/criteria_pack')
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 
 @routes_criteria_pack.route('/create/', methods=['GET'])
diff --git a/app/routes/presentations.py b/app/routes/presentations.py
@@ -1,4 +1,4 @@
-import logging
+from app.root_logger import get_root_logger
 
 from flask import Blueprint, redirect, url_for, render_template
 
@@ -9,7 +9,8 @@
 from app.status import TrainingStatus
 
 routes_presentations = Blueprint('routes_presentations', __name__)
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 
 @routes_presentations.route('/handle_presentation_upload/', methods=['POST'])
diff --git a/app/routes/trainings.py b/app/routes/trainings.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-import logging
+from app.root_logger import get_root_logger
 import time
 import os
 import pytz
@@ -18,7 +18,8 @@
 from app.utils import check_arguments_are_convertible_to_object_id
 
 routes_trainings = Blueprint('routes_trainings', __name__)
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 
 @check_arguments_are_convertible_to_object_id
diff --git a/app/routes/version.py b/app/routes/version.py
@@ -1,9 +1,10 @@
-import logging
+from app.root_logger import get_root_logger
 from flask import render_template, Blueprint
 from app.lti_session_passback.auth_checkers import check_admin
 
 routes_version = Blueprint('routes_version', __name__)
-logger = logging.getLogger('root_logger')
+logger = get_root_logger()
+
 
 
 @routes_version.route('/version/', methods=['GET'])
