Eagerly pre-load today's disk records into push_store_ref at startup
Previously load_today() was only called if in-memory records were empty, which was never true once the first WeConnect poll had completed. Now disk records are loaded unconditionally at startup and merged with live in-memory records (dedup by ts) when a client connects. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
+16
-16
@@ -2,7 +2,6 @@ import json
|
||||
import logging
|
||||
import socket
|
||||
import threading
|
||||
from typing import Callable
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
@@ -12,18 +11,23 @@ def _accept_loop(
|
||||
clients: list,
|
||||
lock: threading.Lock,
|
||||
store_ref: dict,
|
||||
load_today: Callable | None,
|
||||
) -> None:
|
||||
while True:
|
||||
try:
|
||||
conn, addr = server_sock.accept()
|
||||
log.info("Push client connected from %s", addr)
|
||||
with lock:
|
||||
store = store_ref["current"]
|
||||
records = store["records"] if store else []
|
||||
if not records and load_today is not None:
|
||||
log.info("In-memory store empty — loading today's records from disk")
|
||||
records = load_today()
|
||||
store = store_ref["current"]
|
||||
in_mem = store["records"] if store else []
|
||||
preloaded = store_ref.get("preloaded", [])
|
||||
|
||||
if preloaded:
|
||||
seen_ts = {r.get("ts") for r in preloaded}
|
||||
extra = [r for r in in_mem if r.get("ts") not in seen_ts]
|
||||
records = sorted(preloaded + extra, key=lambda r: r.get("ts", ""))
|
||||
else:
|
||||
records = in_mem
|
||||
|
||||
try:
|
||||
for record in records:
|
||||
conn.sendall((json.dumps(record, default=str) + "\n").encode())
|
||||
@@ -53,21 +57,17 @@ def broadcast(snapshot: dict, clients: list, lock: threading.Lock) -> None:
|
||||
log.info("Push client disconnected")
|
||||
|
||||
|
||||
def start_push_server(
|
||||
host: str,
|
||||
port: int,
|
||||
load_today: Callable | None = None,
|
||||
) -> tuple:
|
||||
def start_push_server(host: str, port: int) -> tuple:
|
||||
server_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
server_sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||
server_sock.bind((host, port))
|
||||
server_sock.listen()
|
||||
clients: list = []
|
||||
lock = threading.Lock()
|
||||
store_ref: dict = {"current": None}
|
||||
clients: list = []
|
||||
lock = threading.Lock()
|
||||
store_ref: dict = {"current": None, "preloaded": []}
|
||||
t = threading.Thread(
|
||||
target=_accept_loop,
|
||||
args=(server_sock, clients, lock, store_ref, load_today),
|
||||
args=(server_sock, clients, lock, store_ref),
|
||||
daemon=True,
|
||||
)
|
||||
t.start()
|
||||
|
||||
Reference in New Issue
Block a user