ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
Stop dropping capability/sysinfo payloads on transient /poll failures
Juan Denis19907dec431d
diff --git a/agent/internal/transport/poll/client.go b/agent/internal/transport/poll/client.goindex b2f4eaf9..976d16d4 100644--- a/agent/internal/transport/poll/client.go+++ b/agent/internal/transport/poll/client.go@@ -235,6 +235,13 @@ func (c *Client) pollOnce(ctx context.Context) error {return fmt.Errorf("no session")}+ // Don't drain the system_info / capabilities buffers here. They+ // get refreshed by the agent every 5–60s anyway, and if /poll+ // fails (tunnel reconnect, transient 5xx) the previous behaviour+ // was to silently lose the payload — the panel would then show+ // "none reported" until the next sendCapabilities tick. Re-sending+ // the same payload on every /poll is cheap and the panel's+ // update_capabilities is idempotent (pure overwrite).c.hbMu.Lock()body := map[string]interface{}{}if c.hbMetrics != nil {@@ -242,11 +249,9 @@ func (c *Client) pollOnce(ctx context.Context) error {}if c.sysInfo != nil {body["system_info"] = c.sysInfo- c.sysInfo = nil}if c.caps != nil {body["capabilities"] = c.caps- c.caps = nil}c.hbMu.Unlock()diff --git a/backend/app/services/agent_registry.py b/backend/app/services/agent_registry.pyindex ec62d551..7daed8a0 100644--- a/backend/app/services/agent_registry.py+++ b/backend/app/services/agent_registry.py@@ -756,7 +756,19 @@ class AgentRegistry:up in feature-gated target pickers."""if not isinstance(payload, dict):+ logger.warning("update_capabilities ignored non-dict payload for %s: %r", server_id, type(payload))return+ # Diagnostic trace — the panel showing "none reported" while+ # the agent insists it's pushing means one of these layers is+ # dropping the message. Log the top-level keys + inner caps+ # count once per call so we can see which it is.+ logger.info(+ "update_capabilities for %s: top_keys=%s inner_caps=%s sudo=%r",+ server_id,+ sorted(payload.keys()),+ len(payload.get('capabilities') or {}),+ payload.get('sudo'),+ )caps = payload.get('capabilities') or {}# Coerce values to bool — agents are trusted but defensive# casting protects the API consumer (UI) from malformed types.@@ -862,23 +874,38 @@ class AgentRegistry:# ==================== System Info ====================def update_system_info(self, server_id: str, info: dict):- """Update server system information from agent"""+ """Update server system information from agent.++ The agent now pushes system_info every 5–60 seconds, so any+ single transient probe failure (e.g. Docker briefly+ unreachable, gopsutil WMI hiccup) shouldn't wipe a previously+ good value out of the row. We only overwrite when the new+ payload carries a truthy value.+ """+ def _coalesce(current, new):+ # Treat 0 / "" / None as "the agent didn't probe this" — keep+ # the existing column rather than overwriting with junk.+ if new in (None, "", 0):+ return current+ return new+try:server = Server.query.get(server_id)- if server:- server.hostname = info.get('hostname', server.hostname)- server.os_type = info.get('os', server.os_type)- server.os_version = info.get('os_version', server.os_version)- server.platform = info.get('platform', server.platform)- server.architecture = info.get('architecture', server.architecture)- server.cpu_cores = info.get('cpu_cores', server.cpu_cores)- server.cpu_model = info.get('cpu_model', server.cpu_model)- server.total_memory = info.get('total_memory', server.total_memory)- server.total_disk = info.get('total_disk', server.total_disk)- server.docker_version = info.get('docker_version', server.docker_version)- server.agent_version = info.get('agent_version', server.agent_version)- db.session.commit()- except Exception as e:+ if not server:+ return+ server.hostname = _coalesce(server.hostname, info.get('hostname'))+ server.os_type = _coalesce(server.os_type, info.get('os'))+ server.os_version = _coalesce(server.os_version, info.get('os_version'))+ server.platform = _coalesce(server.platform, info.get('platform'))+ server.architecture = _coalesce(server.architecture, info.get('architecture'))+ server.cpu_cores = _coalesce(server.cpu_cores, info.get('cpu_cores'))+ server.cpu_model = _coalesce(server.cpu_model, info.get('cpu_model'))+ server.total_memory = _coalesce(server.total_memory, info.get('total_memory'))+ server.total_disk = _coalesce(server.total_disk, info.get('total_disk'))+ server.docker_version = _coalesce(server.docker_version, info.get('docker_version'))+ server.agent_version = _coalesce(server.agent_version, info.get('agent_version'))+ db.session.commit()+ except Exception:logger.exception("Error updating system info")db.session.rollback()