logging, routing

packages/tracker/meshnet_tracker/server.py

@@ -26,6 +26,7 @@ import hashlib
 import itertools
 import json
 import os
+import select
 import socketserver
 import sqlite3
 import tarfile
@@ -46,8 +47,9 @@ from .wallet_proof import binding_message, verify_wallet_signature
 from .billing import DEFAULT_BILLING_DB_PATH, BillingLedger
 from .calibration import DEFAULT_CALIBRATION_DB_PATH, ToplocCalibrationStore
 from .hf_pricing import DEFAULT_HF_PRICING_LOG_DB_PATH, HfPricingLog, refresh_preset_price
-from .gossip import NodeGossip
-from .model_files import files_for_layer_range, snapshot_dir_for_repo
+from .gossip import NodeGossip
+from .logging_setup import tracker_logger
+from .model_files import files_for_layer_range, snapshot_dir_for_repo
 from .raft import RaftNode
 
 
@@ -2092,7 +2094,7 @@ def _registration_ban_error(contracts: Any | None, wallet_address: str | None) -
     return None
 
 
-def _tracker_log(
+def _tracker_log(
     server: "_TrackerHTTPServer",
     level: str,
     message: str,
@@ -2100,11 +2102,18 @@ def _tracker_log(
     stdout: bool = True,
     update_console_key: str | None = None,
     **fields: Any,
-) -> None:
-    event = {
-        "ts": time.time(),
-        "level": level,
-        "message": message,
+) -> None:
+    log_level = {
+        "debug": 10,
+        "info": 20,
+        "warn": 30,
+        "warning": 30,
+        "error": 40,
+    }.get(level.lower(), 20)
+    event = {
+        "ts": time.time(),
+        "level": level,
+        "message": message,
         "fields": {
             key: value
             for key, value in fields.items()
@@ -2125,12 +2134,13 @@ def _tracker_log(
                     break
             if not updated:
                 server.console_events.append(event)
-        else:
-            server.console_events.append(event)
-    if stdout:
-        extras = " ".join(f"{key}={value}" for key, value in event["fields"].items())
-        suffix = f"  {extras}" if extras else ""
-        print(f"[tracker] {level}: {message}{suffix}", flush=True)
+        else:
+            server.console_events.append(event)
+    extras = " ".join(f"{key}={value}" for key, value in event["fields"].items())
+    suffix = f"  {extras}" if extras else ""
+    tracker_logger().log(log_level, f"{message}{suffix}")
+    if stdout:
+        print(f"[tracker] {level}: {message}{suffix}", flush=True)
 
 
 @dataclass
@@ -2182,10 +2192,14 @@ def _request_proxy_cancel(server: "_TrackerHTTPServer", request_id: str) -> bool
     return True
 
 
-def _set_upstream_read_timeout(upstream: Any, timeout: float) -> None:
+def _upstream_socket(upstream: Any) -> Any | None:
     fp = getattr(upstream, "fp", None)
     raw = getattr(fp, "raw", None) if fp is not None else None
-    sock = getattr(raw, "_sock", None) if raw is not None else None
+    return getattr(raw, "_sock", None) if raw is not None else None
+
+
+def _set_upstream_read_timeout(upstream: Any, timeout: float | None) -> None:
+    sock = _upstream_socket(upstream)
     if sock is not None:
         sock.settimeout(timeout)
 
@@ -3206,7 +3220,11 @@ class _TrackerHandler(http.server.BaseHTTPRequestHandler):
             upstream = upstream_result[0]
             with proxy_ctx.upstream_lock:
                 proxy_ctx.upstream = upstream
-            _set_upstream_read_timeout(upstream, 0.5)
+            upstream_sock = _upstream_socket(upstream)
+            if upstream_sock is not None:
+                _set_upstream_read_timeout(upstream, None)
+            else:
+                _set_upstream_read_timeout(upstream, 0.5)
             _tracker_log(server, "info", "proxy connected", request_id=request_id, target_url=target_url)
         except urllib.error.HTTPError as exc:
             # Relay error status + body from node
@@ -3266,6 +3284,10 @@ class _TrackerHandler(http.server.BaseHTTPRequestHandler):
                     while True:
                         if proxy_ctx.cancel_event.is_set():
                             break
+                        if upstream_sock is not None:
+                            readable, _, _ = select.select([upstream_sock], [], [], 0.5)
+                            if not readable:
+                                continue
                         try:
                             line = upstream.readline()
                         except TimeoutError: