From 7f470ada63aefc089be747ae0e27552c97a9dfad Mon Sep 17 00:00:00 2001 From: Sergey Date: Sun, 17 May 2026 15:56:22 +0700 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=BA=D0=BB=D1=8E=D1=87=D0=B8=20=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=BA=D0=BE=D0=B2=D1=8B=D0=B5,=20=D0=B7?= =?UTF-8?q?=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20bytes=20=D0=B2=20b?= =?UTF-8?q?inary=5Fresource?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- monitor.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/monitor.py b/monitor.py index ce82e96..41f9409 100644 --- a/monitor.py +++ b/monitor.py @@ -85,17 +85,15 @@ def fetch_address_list(api) -> list[str]: resource = api.get_binary_resource("/ip/firewall/address-list") all_entries = resource.get() - log.info("DEBUG address-list raw: %s", all_entries) - ip_list = [] for entry in all_entries: - entry_list = decode(entry.get(b"list", b"")) - log.info("DEBUG entry list='%s' address='%s'", entry_list, decode(entry.get(b"address", b""))) + # Ключи строковые, значения — bytes + entry_list = decode(entry.get("list", b"")) if entry_list != ADDRESS_LIST_NAME: continue - if decode(entry.get(b"disabled", b"false")) == "true": + if decode(entry.get("disabled", b"false")) == "true": continue - address = decode(entry.get(b"address", b"")).strip() + address = decode(entry.get("address", b"")).strip() if "/" in address: address = address.split("/")[0] if address: @@ -174,7 +172,7 @@ def fetch_identity(api) -> str: resource = api.get_binary_resource("/system/identity") result = resource.get() if result: - return decode(result[0].get(b"name", MIKROTIK_HOST.encode())) + return decode(result[0].get("name", MIKROTIK_HOST.encode())) return MIKROTIK_HOST except Exception: return MIKROTIK_HOST