ready for release
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,5 +1,5 @@
|
||||
__pycache__
|
||||
venv/
|
||||
.venv/
|
||||
.vscode/
|
||||
log*.log
|
||||
config_manager.egg-info
|
||||
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "config_manager"
|
||||
version = "1.1.0"
|
||||
version = "1.2.0"
|
||||
description = "Config manager for building applications"
|
||||
authors = [
|
||||
{ name = "Aleksei Zosimov", email = "lesha.spb@gmail.com" }
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
from config_manager import ConfigManager
|
||||
@@ -1,53 +0,0 @@
|
||||
# === Раздел с общими конфигурационными параметрами ===
|
||||
param: 5
|
||||
|
||||
# === Логирование ===
|
||||
log:
|
||||
version: 1
|
||||
disable_existing_loggers: False
|
||||
|
||||
formatters:
|
||||
standard:
|
||||
format: '%(asctime)s %(module)15s [%(levelname)8s]: %(message)s'
|
||||
telegram:
|
||||
format: '%(message)s'
|
||||
|
||||
handlers:
|
||||
console:
|
||||
level: DEBUG
|
||||
formatter: standard
|
||||
class: logging.StreamHandler
|
||||
stream: ext://sys.stdout # Default is stderr
|
||||
|
||||
file:
|
||||
level: DEBUG
|
||||
formatter: standard
|
||||
class: logging.handlers.RotatingFileHandler
|
||||
filename: logs/log.log
|
||||
mode: a
|
||||
maxBytes: 500000
|
||||
backupCount: 15
|
||||
|
||||
#telegram:
|
||||
# level: CRITICAL
|
||||
# formatter: telegram
|
||||
# class: logging_telegram_handler.TelegramHandler
|
||||
# chat_id: 211945135
|
||||
# alias: "PDC"
|
||||
|
||||
|
||||
# -- Логгеры --
|
||||
loggers:
|
||||
'':
|
||||
handlers: [console, file]
|
||||
level: INFO
|
||||
propagate: False
|
||||
|
||||
__main__:
|
||||
handlers: [console, file]
|
||||
level: DEBUG
|
||||
propagate: False
|
||||
|
||||
config_manager:
|
||||
handlers: [console, file]
|
||||
level: DEBUG
|
||||
@@ -1,150 +0,0 @@
|
||||
import logging
|
||||
import logging.config
|
||||
import asyncio
|
||||
import json
|
||||
import yaml
|
||||
import os
|
||||
from typing import Any, Optional
|
||||
|
||||
<<<<<<<< HEAD:src/config_manager.py
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
========
|
||||
from .log_manager import LogManager
|
||||
>>>>>>>> develop:src/basic_application/config_manager.py
|
||||
|
||||
class ConfigManager:
|
||||
DEFAULT_UPDATE_INTERVAL = 5.0
|
||||
DEFAULT_WORK_INTERVAL = 2.0
|
||||
|
||||
def __init__(self, path: str, log_manager: Optional[LogManager] = None):
|
||||
self.path = path
|
||||
self.config: Any = None
|
||||
self._last_hash = None
|
||||
self.update_interval = self.DEFAULT_UPDATE_INTERVAL
|
||||
self.work_interval = self.DEFAULT_WORK_INTERVAL
|
||||
self._halt = asyncio.Event()
|
||||
self._task: Optional[asyncio.Task] = None
|
||||
self._loop: Optional[asyncio.AbstractEventLoop] = None
|
||||
|
||||
self._log_manager = log_manager or LogManager()
|
||||
self.logger = logging.getLogger(__name__)
|
||||
|
||||
def _read_file_sync(self) -> str:
|
||||
with open(self.path, "r", encoding="utf-8") as f:
|
||||
return f.read()
|
||||
|
||||
async def _read_file_async(self) -> str:
|
||||
return await asyncio.to_thread(self._read_file_sync)
|
||||
|
||||
<<<<<<<< HEAD:src/config_manager.py
|
||||
def _parse_config(self, data) -> Any:
|
||||
========
|
||||
def _parse_config(self, data) -> Any:
|
||||
>>>>>>>> develop:src/basic_application/config_manager.py
|
||||
extension = os.path.splitext(self.path)[1].lower()
|
||||
if extension in (".yaml", ".yml"):
|
||||
return yaml.safe_load(data)
|
||||
else:
|
||||
return json.loads(data)
|
||||
|
||||
def _update_intervals_from_config(self) -> None:
|
||||
if not self.config:
|
||||
return
|
||||
upd = self.config.get("update_interval")
|
||||
wrk = self.config.get("work_interval")
|
||||
|
||||
if isinstance(upd, (int, float)) and upd > 0:
|
||||
self.update_interval = float(upd)
|
||||
self.logger.info(f"Update interval set to {self.update_interval} seconds")
|
||||
else:
|
||||
self.update_interval = self.DEFAULT_UPDATE_INTERVAL
|
||||
|
||||
if isinstance(wrk, (int, float)) and wrk > 0:
|
||||
self.work_interval = float(wrk)
|
||||
self.logger.info(f"Work interval set to {self.work_interval} seconds")
|
||||
else:
|
||||
self.work_interval = self.DEFAULT_WORK_INTERVAL
|
||||
|
||||
async def _update_config(self) -> None:
|
||||
try:
|
||||
data = await self._read_file_async()
|
||||
current_hash = hash(data)
|
||||
if current_hash != self._last_hash:
|
||||
new_config = self._parse_config(data)
|
||||
self.config = new_config
|
||||
self._last_hash = current_hash
|
||||
|
||||
self._log_manager.apply_config(new_config)
|
||||
self._update_intervals_from_config()
|
||||
|
||||
except Exception as e:
|
||||
self.logger.error(f"Error reading/parsing config file: {e}")
|
||||
|
||||
def execute(self) -> None:
|
||||
"""
|
||||
Метод для переопределения в подклассах.
|
||||
Здесь может быть блокирующая работа.
|
||||
Запускается в отдельном потоке.
|
||||
"""
|
||||
pass
|
||||
|
||||
async def _worker_loop(self) -> None:
|
||||
while not self._halt.is_set():
|
||||
await asyncio.to_thread(self.execute)
|
||||
await asyncio.sleep(self.work_interval)
|
||||
|
||||
async def _periodic_update_loop(self) -> None:
|
||||
while not self._halt.is_set():
|
||||
await self._update_config()
|
||||
await asyncio.sleep(self.update_interval)
|
||||
|
||||
async def _run(self) -> None:
|
||||
"""Внутренняя корутина, запускающая все циклы"""
|
||||
self._halt.clear()
|
||||
self.logger.info("ConfigManager started")
|
||||
try:
|
||||
await asyncio.gather(
|
||||
self._worker_loop(),
|
||||
self._periodic_update_loop()
|
||||
)
|
||||
except asyncio.CancelledError:
|
||||
self.logger.info("ConfigManager tasks cancelled")
|
||||
finally:
|
||||
self.logger.info("ConfigManager stopped")
|
||||
|
||||
def start(self) -> None:
|
||||
"""Запускает менеджер конфигурации в текущем event loop"""
|
||||
if self._task is not None and not self._task.done():
|
||||
self.logger.warning("ConfigManager is already running")
|
||||
return
|
||||
|
||||
try:
|
||||
self._loop = asyncio.get_running_loop()
|
||||
except RuntimeError:
|
||||
self.logger.error("start() must be called from within an async context")
|
||||
raise
|
||||
|
||||
self._task = self._loop.create_task(self._run())
|
||||
self.logger.info("ConfigManager task created")
|
||||
|
||||
async def stop(self) -> None:
|
||||
"""Останавливает менеджер конфигурации и ожидает завершения"""
|
||||
if self._task is None:
|
||||
self.logger.warning("ConfigManager is not running")
|
||||
return
|
||||
|
||||
self.logger.info("ConfigManager stopping...")
|
||||
self._halt.set()
|
||||
|
||||
try:
|
||||
await self._task
|
||||
except asyncio.CancelledError:
|
||||
pass
|
||||
|
||||
self._task = None
|
||||
<<<<<<<< HEAD:src/config_manager.py
|
||||
logger.info("ConfigManager stopped successfully")
|
||||
========
|
||||
self.logger.info("ConfigManager stopped successfully")
|
||||
>>>>>>>> develop:src/basic_application/config_manager.py
|
||||
@@ -1,26 +0,0 @@
|
||||
import os
|
||||
os.chdir(os.path.dirname(__file__))
|
||||
|
||||
import logging
|
||||
import asyncio
|
||||
|
||||
from config_manager.config_manager import ConfigManager
|
||||
logger = logging.getLogger()
|
||||
|
||||
# Пример наследования и переопределения execute
|
||||
class MyApp(ConfigManager):
|
||||
def execute(self) -> None:
|
||||
logger.info("Executing blocking work with config: %s", self.config)
|
||||
|
||||
|
||||
async def main():
|
||||
app = MyApp("config.yaml")
|
||||
app.start()
|
||||
await asyncio.sleep(20)
|
||||
await app.stop()
|
||||
logger.info("Work finished.")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
asyncio.run(main())
|
||||
@@ -1,9 +1,12 @@
|
||||
#import os
|
||||
#os.chdir(os.path.dirname(__file__))
|
||||
|
||||
from config_manager import ConfigManager
|
||||
import logging
|
||||
import asyncio
|
||||
from typing import Optional
|
||||
#import os
|
||||
#os.chdir(os.path.dirname(__file__))
|
||||
|
||||
|
||||
|
||||
logger = logging.getLogger()
|
||||
|
||||
Reference in New Issue
Block a user