Skip to content

Commit 0ca3dfa

Browse files
committed
fix: restore DB connection helper used to load inverter_model setting
1 parent 61635a5 commit 0ca3dfa

1 file changed

Lines changed: 11 additions & 5 deletions

File tree

‎collector/collector.py‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,13 +183,19 @@ def _load_db_serials(cfg: CollectorConfig) -> None:
183183
logger.exception("Failed to load serials from MariaDB settings")
184184

185185

186-
def _load_db_setting(name: str) -> Optional[str]:
186+
def _load_db_setting(name: str, cfg: CollectorConfig) -> Optional[str]:
187187
"""Load a single setting value from MariaDB, or None if unavailable."""
188188
try:
189+
import pymysql
189190
from .settings import get
190-
conn = _get_db_conn()
191-
if conn is None:
192-
return None
191+
conn = pymysql.connect(
192+
host=cfg.outputs.mariadb_host,
193+
port=cfg.outputs.mariadb_port,
194+
user=cfg.outputs.mariadb_user,
195+
password=cfg.outputs.mariadb_password,
196+
database=cfg.outputs.mariadb_database,
197+
autocommit=True,
198+
)
193199
try:
194200
return get(conn, name)
195201
finally:
@@ -507,7 +513,7 @@ def run_collector(
507513
"LUX_POLL_MODE=true is deprecated; set LUX_TRANSPORT=tcp_active instead"
508514
)
509515

510-
inverter_model = _env_or("LUX_INVERTER_MODEL") or _load_db_setting("inverter_model") or DEFAULT_MODEL
516+
inverter_model = _env_or("LUX_INVERTER_MODEL") or _load_db_setting("inverter_model", cfg) or DEFAULT_MODEL
511517
try:
512518
driver = get_driver(inverter_model)
513519
logger.info("Using inverter driver: %s", driver.label)

0 commit comments

Comments
 (0)