Development

routlin/core.py

@@ -87,7 +87,6 @@ Usage:
 import hashlib
 import ipaddress
 import json
-import logging
 import os
 import re
 import subprocess
@@ -108,7 +107,6 @@ PRODUCT_NAME      = "routlin"
 SCRIPT_DIR        = Path(__file__).parent
 CONFIG_FILE       = SCRIPT_DIR / "core.json"
 BLOCKLIST_DIR     = SCRIPT_DIR / "blocklists"
-LOG_FILE          = SCRIPT_DIR / "core.log"
 METRICS_FILE      = SCRIPT_DIR / ".dns-metrics"
 DNSMASQ_CONF_DIR  = Path(f"/etc/dnsmasq-{PRODUCT_NAME}")
 LEASES_DIR        = Path("/var/lib/misc")
@@ -140,48 +138,6 @@ NAT_SERVICE_FILE  = SYSTEMD_DIR / f"{NAT_SERVICE_NAME}.service"
 WG_DIR            = Path("/etc/wireguard")
 WG_KEEPALIVE      = 25
 
-log = None
-
-# ===================================================================
-# Logging
-# ===================================================================
-
-def chown_to_script_dir_owner(path):
-    """Chown a file to the owner of the script directory.
-    This works correctly whether invoked via sudo, directly as root (e.g. systemd timer),
-    or as a normal user - the script directory owner is always the right target.
-    """
-    try:
-        stat = SCRIPT_DIR.stat()
-        os.chown(path, stat.st_uid, stat.st_gid)
-    except OSError:
-        pass  # non-fatal
-
-def setup_logging(max_kb, errors_only):
-    global log
-    try:
-        if LOG_FILE.exists() and LOG_FILE.stat().st_size > max_kb * 1024:
-            LOG_FILE.write_text("")
-        if not LOG_FILE.exists():
-            LOG_FILE.touch()
-        chown_to_script_dir_owner(LOG_FILE)
-        file_handler = logging.FileHandler(LOG_FILE)
-    except PermissionError:
-        print(f"WARNING: Cannot write to {LOG_FILE} (permission denied). "
-              f"Run with sudo or fix ownership: sudo chown $USER {LOG_FILE}")
-        file_handler = None
-    level = logging.ERROR if errors_only else logging.INFO
-    handlers = [logging.StreamHandler(sys.stdout)]
-    if file_handler:
-        handlers.insert(0, file_handler)
-    logging.basicConfig(
-        level=level,
-        format="%(asctime)s  %(levelname)-8s  %(message)s",
-        datefmt="%Y-%m-%d %H:%M:%S",
-        handlers=handlers,
-    )
-    log = logging.getLogger("dns-dhcp")
-
 # ===================================================================
 # Helpers
 # ===================================================================
@@ -592,7 +548,7 @@ def build_vlan_dnsmasq_conf(vlan, data, iface):
             continue  # skip IPv6 upstream -- WAN has no IPv6 address
         line(f"server={srv}")
     line(f"cache-size={dns_cfg.get('cache_size', 1000)}")
-    if general.get("dnsmasq_log_queries", False):
+    if vlan.get("dnsmasq_log_queries", False):
         line("log-queries")
     line()
 
@@ -3132,11 +3088,6 @@ def main():
             print(f"  - {e}", file=sys.stderr)
         sys.exit(1)
 
-    general = data.get("dns_blocking", {}).get("general", {})
-    setup_logging(
-        general.get("log_max_kb", 1024),
-        general.get("log_errors_only", False)
-    )
 
     if args.status:
         show_status(data)