Development

docker/routlin-dash/app/view_page.py

@@ -1,6 +1,6 @@
 from flask import Blueprint, session, redirect, get_flashed_messages
 from markupsafe import Markup
-import json, re, subprocess, os, sys
+import json, re, subprocess, os, sys, glob
 import sanitize
 import validation as validate
 from datetime import datetime, timezone
@@ -153,21 +153,21 @@ def resolve_iface(vlan, cfg):
 
 def live_dhcp_leases():
     rows = []
-    leases_file = '/var/lib/misc/dnsmasq.leases'
+    for leases_file in glob.glob('/var/lib/misc/*.leases'):
-    try:
+        try:
-        with open(leases_file) as f:
+            with open(leases_file) as f:
-            for line in f:
+                for line in f:
-                parts = line.strip().split()
+                    parts = line.strip().split()
-                if len(parts) >= 4:
+                    if len(parts) >= 4:
-                    rows.append({
+                        rows.append({
-                        'hostname':    parts[3] if parts[3] != '*' else '-',
+                            'hostname':    parts[3] if parts[3] != '*' else '-',
-                        'ip_address':  parts[2],
+                            'ip_address':  parts[2],
-                        'mac_address': parts[1],
+                            'mac_address': parts[1],
-                        'vlan_name':   _vlan_name_for_ip(parts[2]),
+                            'vlan_name':   _vlan_name_for_ip(parts[2]),
-                        'expires':     fmt_timestamp(int(parts[0])),
+                            'expires':     fmt_timestamp(int(parts[0])),
-                    })
+                        })
-    except Exception:
+        except Exception:
-        pass
+            pass
     return rows
 
 def _vlan_name_for_ip(ip):

docker/routlin-dash/docker-compose.yml

@@ -13,6 +13,7 @@ services:
       - /sys/class/net:/sys/class/net:ro
       - /sys/devices:/sys/devices:ro
       - /etc/localtime:/etc/localtime:ro
+      - /var/lib/misc:/var/lib/misc:ro
     environment:
       - PYTHONPATH=/routlin_location
       - WEB_APP_DISPLAY_NAME=Routlin Dashboard