From cdaa5deb588973de074b2524bbc2e65f5fc9ea08 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Sat, 29 Nov 2025 20:44:17 +0100 Subject: [PATCH] load redis and mqtt only from env --- apps/abstraction/main.py | 16 +++++++++++++--- config/devices.yaml | 10 ---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apps/abstraction/main.py b/apps/abstraction/main.py index c434ef4..7839be5 100644 --- a/apps/abstraction/main.py +++ b/apps/abstraction/main.py @@ -391,9 +391,19 @@ async def async_main() -> None: validate_devices(devices) logger.info(f"Loaded {len(devices)} device(s) from configuration") - # Get Redis URL from config or environment variable or use default - redis_config = config.get("redis", {}) - redis_url = redis_config.get("url") or os.environ.get("REDIS_URL", "redis://localhost:6379/0") + # Build Redis URL from environment variables or config or use default + redis_host = os.environ.get("REDIS_HOST") + redis_port = os.environ.get("REDIS_PORT") + redis_db = os.environ.get("REDIS_DB") + + if redis_host and redis_port and redis_db: + redis_url = f"redis://{redis_host}:{redis_port}/{redis_db}" + logger.info(f"Using Redis from environment variables: {redis_url}") + else: + # Fallback to config file + redis_config = config.get("redis", {}) + redis_url = redis_config.get("url") or "redis://localhost:6379/0" + logger.info(f"Using Redis from config file: {redis_url}") # Connect to Redis with retry redis_client = await get_redis_client(redis_url) diff --git a/config/devices.yaml b/config/devices.yaml index 6d4dde2..0e43569 100644 --- a/config/devices.yaml +++ b/config/devices.yaml @@ -1,14 +1,4 @@ version: 1 -mqtt: - broker: "172.16.2.16" - port: 1883 - client_id: "home-automation-abstraction" - username: null - password: null - keepalive: 60 -redis: - url: "redis://172.23.1.116:6379/8" - channel: "ui:updates" devices: - device_id: lampe_semeniere_wohnzimmer name: Semeniere