[DOP-21731] - add logging configuration for scheduler (#152)

Author: maxim-lixakov

poetry.lock

@@ -121,6 +121,9 @@ scheduler = [
     "asyncpg",
     "python-multipart",
     "python-jose",
+    "pyyaml",
+    "coloredlogs",
+    "python-json-logger",
     "celery",
 ]
 

pyproject.toml

@@ -3,6 +3,7 @@
 import asyncio
 import logging
 
+from syncmaster.scheduler.logging import setup_logging
 from syncmaster.scheduler.settings import SchedulerAppSettings as Settings
 from syncmaster.scheduler.transfer_fetcher import TransferFetcher
 from syncmaster.scheduler.transfer_job_manager import TransferJobManager
@@ -12,6 +13,7 @@
 
 async def main():
     settings = Settings()
+    setup_logging(settings.logging.get_log_config_path())
     transfer_fetcher = TransferFetcher(settings)
     transfer_job_manager = TransferJobManager(settings)
     transfer_job_manager.scheduler.start()

syncmaster/scheduler/__main__.py

@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-License-Identifier: Apache-2.0
+
+import logging
+from logging.config import dictConfig
+from pathlib import Path
+
+import yaml
+
+logger = logging.getLogger(__name__)
+
+
+def setup_logging(config_path: Path) -> None:
+    """Parse file with logging configuration, and setup logging accordingly"""
+    if not config_path.exists():
+        raise OSError(f"Logging configuration file '{config_path}' does not exist")
+    config = yaml.safe_load(config_path.read_text())
+    dictConfig(config)

syncmaster/scheduler/logging.py

@@ -6,6 +6,7 @@
 from syncmaster.settings import (
     CredentialsEncryptionSettings,
     DatabaseSettings,
+    LoggingSettings,
     RabbitMQSettings,
 )
 
@@ -64,6 +65,7 @@ class SchedulerAppSettings(BaseSettings):
 
     database: DatabaseSettings = Field(description="Database settings")
     broker: RabbitMQSettings = Field(description="Broker settings")
+    logging: LoggingSettings = Field(default_factory=LoggingSettings, description="Logging settings")
     scheduler: SchedulerSettings = Field(default_factory=SchedulerSettings, description="Scheduler-specific settings")
     encryption: CredentialsEncryptionSettings = Field(
         default_factory=CredentialsEncryptionSettings,

syncmaster/scheduler/settings/__init__.py

@@ -43,3 +43,7 @@ loggers:
     level: DEBUG
     handlers: [celery]
     propagate: false
+  scheduler:
+    handlers: [main]
+    level: INFO
+    propagate: false

syncmaster/settings/log/colored.yml

@@ -42,3 +42,7 @@ loggers:
     level: DEBUG
     handlers: [celery]
     propagate: false
+  scheduler:
+    handlers: [main]
+    level: INFO
+    propagate: false

syncmaster/settings/log/json.yml

@@ -43,3 +43,7 @@ loggers:
     level: DEBUG
     handlers: [celery]
     propagate: false
+  scheduler:
+    handlers: [main]
+    level: INFO
+    propagate: false