remoteRF-server 0.1.68__tar.gz → 0.1.69__tar.gz

{remoterf_server-0.1.68 → remoterf_server-0.1.69}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 0.1.68
+Version: 0.1.69
 Description-Content-Type: text/markdown
 Requires-Dist: grpcio
 Requires-Dist: protobuf

{remoterf_server-0.1.68 → remoterf_server-0.1.69}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remoteRF-server"
-version = "0.1.68"
+version = "0.1.69"
 dependencies = [
   "grpcio",
   "protobuf",

{remoterf_server-0.1.68 → remoterf_server-0.1.69}/src/remoteRF_server/host/host_tunnel_server.py

@@ -10,6 +10,7 @@ import secrets
 import traceback
 import hashlib
 import re
+import os
 
 from dataclasses import dataclass
 from typing import Dict, Optional, Tuple, Any, List, Set, Iterator
@@ -18,7 +19,6 @@ from concurrent.futures import Future
 from concurrent import futures
 
 import grpc
-import os
 
 # Your existing GenericRPC schema compiled to python.
 from ..common.grpc import grpc_pb2 as generic_pb2  # type: ignore
@@ -39,58 +39,18 @@ from .host_directory_store import (
 )
 
 # =============================================================================
-# Always-on logging with lightweight toggles (env + runtime)
+# Hardcoded logging mode (NO env vars)
+#
+# Pick ONE:
+#   LOG_MODE = "OFF"   -> show nothing
+#   LOG_MODE = "WARN"  -> show only WARN + ERROR
+#   LOG_MODE = "ALL"   -> show everything (INFO + WARN + ERROR)
 # =============================================================================
 
-_LOG_LOCK = threading.Lock()
-_LOG_LEVELS: set[str] = set()     # {"INFO","WARN","ERROR"}
-_LOG_SUPPRESS: set[str] = set()   # {"HEARTBEAT","OUTBOUND","INBOUND"}
-
-def _init_log_state_from_env() -> None:
-    """
-    Env knobs:
-      REMOTERF_LOG_LEVELS="INFO,WARN,ERROR"  (default: WARN,ERROR)
-      REMOTERF_LOG_SUPPRESS="HEARTBEAT"      (default: HEARTBEAT)
-    """
-    global _LOG_LEVELS, _LOG_SUPPRESS
-
-    levels = os.getenv("REMOTERF_LOG_LEVELS", "").strip()
-    suppress = os.getenv("REMOTERF_LOG_SUPPRESS", "").strip()
-
-    if not levels:
-        _LOG_LEVELS = {"WARN", "ERROR"}
-    else:
-        _LOG_LEVELS = {x.strip().upper() for x in levels.split(",") if x.strip()}
-
-    if not suppress:
-        _LOG_SUPPRESS = {"HEARTBEAT"}  # sane default: avoid spam
-    else:
-        _LOG_SUPPRESS = {x.strip().upper() for x in suppress.split(",") if x.strip()}
+LOG_MODE = "WARN"  # <-- change this
 
-_init_log_state_from_env()
-
-def set_log_levels(levels: str) -> None:
-    """Runtime: set levels, e.g. set_log_levels('INFO,WARN,ERROR')"""
-    global _LOG_LEVELS
-    with _LOG_LOCK:
-        _LOG_LEVELS = {x.strip().upper() for x in (levels or "").split(",") if x.strip()}
-
-def set_log_suppress(tags: str) -> None:
-    """Runtime: set suppressed tags, e.g. set_log_suppress('HEARTBEAT,OUTBOUND')"""
-    global _LOG_SUPPRESS
-    with _LOG_LOCK:
-        _LOG_SUPPRESS = {x.strip().upper() for x in (tags or "").split(",") if x.strip()}
+_LOG_LOCK = threading.Lock()
 
-def _should_log(level: str, tag: str = "") -> bool:
-    lvl = (level or "").upper()
-    tg = (tag or "").upper()
-    with _LOG_LOCK:
-        if lvl not in _LOG_LEVELS:
-            return False
-        if tg and tg in _LOG_SUPPRESS:
-            return False
-        return True
-    
 def _ts() -> str:
     t = time.time()
     sec = int(t)
@@ -98,23 +58,35 @@ def _ts() -> str:
     lt = time.localtime(sec)
     return time.strftime("%H:%M:%S", lt) + f".{ms:03d}"
 
-def _log(level: str, msg: str, *, tag: str = "") -> None:
-    if not _should_log(level, tag):
+def _should_log(level: str) -> bool:
+    lvl = (level or "").upper()
+    mode = (LOG_MODE or "").upper()
+    if mode == "OFF":
+        return False
+    if mode == "WARN":
+        return lvl in ("WARN", "ERROR")
+    if mode == "ALL":
+        return lvl in ("INFO", "WARN", "ERROR")
+    # safe default if mis-set
+    return lvl in ("WARN", "ERROR")
+
+def _log(level: str, msg: str) -> None:
+    if not _should_log(level):
         return
     tn = threading.current_thread().name
     print(f"{_ts()} {level:<5} [{tn}] hostrf.host_tunnel_server: {msg}", file=sys.stderr, flush=True)
 
-def info(msg: str, *, tag: str = "") -> None:
-    _log("INFO", msg, tag=tag)
+def info(msg: str) -> None:
+    _log("INFO", msg)
 
-def warn(msg: str, *, tag: str = "") -> None:
-    _log("WARN", msg, tag=tag)
+def warn(msg: str) -> None:
+    _log("WARN", msg)
 
-def error(msg: str, *, tag: str = "") -> None:
-    _log("ERROR", msg, tag=tag)
+def error(msg: str) -> None:
+    _log("ERROR", msg)
 
-def exception(msg: str, *, tag: str = "") -> None:
-    _log("ERROR", msg, tag=tag)
+def exception(msg: str) -> None:
+    _log("ERROR", msg)
     traceback.print_exc(limit=80, file=sys.stderr)
 
 # =============================================================================
@@ -139,7 +111,6 @@ def _copy_argument_map(dst_map: Any, src_map: Any) -> None:
         for k, v in dict(src_map).items():
             dst_map[str(k)].CopyFrom(v)
 
-
 # =============================================================================
 # Types
 # =============================================================================
@@ -163,7 +134,6 @@ class DeviceStatus:
     online: bool = False
     last_seen_ms: int = 0
 
-
 # =============================================================================
 # Session
 # =============================================================================
@@ -221,7 +191,6 @@ class HostSession:
 
         info(f"[session] closed host_id={self.host_id!r}")
 
-
 # =============================================================================
 # Registry
 # =============================================================================
@@ -771,7 +740,6 @@ class HostTunnelRegistry:
             cancel_on_timeout=cancel_on_timeout,
         )
 
-
 # =============================================================================
 # Convenience forwarders
 # =============================================================================
@@ -818,7 +786,6 @@ def handle_host_device_request(
         cancel_on_timeout=True,
     )
 
-
 # =============================================================================
 # Servicer
 # =============================================================================
@@ -1036,7 +1003,6 @@ class HostTunnelServicer(host_tunnel_pb2_grpc.HostTunnelServicer):
 
         info(f"[Connect] stream ended peer={peer} host_id={host_id or '?'}")
 
-
 # =============================================================================
 # Credentials + server start
 # =============================================================================
@@ -1057,7 +1023,6 @@ def build_server_credentials(
         )
     return grpc.ssl_server_credentials(((private_key_pem, certificate_chain_pem),))
 
-
 def start_host_tunnel_server(
     *,
     host: str,

{remoterf_server-0.1.68 → remoterf_server-0.1.69}/src/remoteRF_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 0.1.68
+Version: 0.1.69
 Description-Content-Type: text/markdown
 Requires-Dist: grpcio
 Requires-Dist: protobuf