anti
25ba3fb56a
Services now print RFC 5424 to stdout; Docker captures via json-file driver. A new host-side collector (decnet.web.collector) streams docker logs from all running decky service containers and writes RFC 5424 + parsed JSON to the host log file. The existing ingester continues to tail the .json file unchanged. rsyslog can consume the .log file independently — no DECNET involvement needed. Removes: bind-mount volume injection, _LOG_NETWORK bridge, log_target config field and --log-target CLI flag, TCP syslog forwarding from service templates.
80 lines
2.9 KiB
Python
80 lines
2.9 KiB
Python
import logging
|
|
import os
|
|
|
|
from fastapi import APIRouter, Depends, HTTPException
|
|
|
|
from decnet.config import DEFAULT_MUTATE_INTERVAL, DecnetConfig, load_state
|
|
from decnet.deployer import deploy as _deploy
|
|
from decnet.ini_loader import load_ini_from_string
|
|
from decnet.network import detect_interface, detect_subnet, get_host_ip
|
|
from decnet.web.dependencies import get_current_user
|
|
from decnet.web.db.models import DeployIniRequest
|
|
|
|
router = APIRouter()
|
|
|
|
|
|
@router.post("/deckies/deploy", tags=["Fleet Management"])
|
|
async def api_deploy_deckies(req: DeployIniRequest, current_user: str = Depends(get_current_user)) -> dict[str, str]:
|
|
from decnet.cli import _build_deckies_from_ini
|
|
|
|
try:
|
|
ini = load_ini_from_string(req.ini_content)
|
|
except Exception as e:
|
|
raise HTTPException(status_code=400, detail=f"Failed to parse INI: {e}")
|
|
|
|
state = load_state()
|
|
ingest_log_file = os.environ.get("DECNET_INGEST_LOG_FILE")
|
|
|
|
if state:
|
|
config, _ = state
|
|
subnet_cidr = ini.subnet or config.subnet
|
|
gateway = ini.gateway or config.gateway
|
|
host_ip = get_host_ip(config.interface)
|
|
randomize_services = False
|
|
# Always sync config log_file with current API ingestion target
|
|
if ingest_log_file:
|
|
config.log_file = ingest_log_file
|
|
else:
|
|
# If no state exists, we need to infer network details
|
|
iface = ini.interface or detect_interface()
|
|
subnet_cidr, gateway = ini.subnet, ini.gateway
|
|
if not subnet_cidr or not gateway:
|
|
detected_subnet, detected_gateway = detect_subnet(iface)
|
|
subnet_cidr = subnet_cidr or detected_subnet
|
|
gateway = gateway or detected_gateway
|
|
host_ip = get_host_ip(iface)
|
|
randomize_services = False
|
|
config = DecnetConfig(
|
|
mode="unihost",
|
|
interface=iface,
|
|
subnet=subnet_cidr,
|
|
gateway=gateway,
|
|
deckies=[],
|
|
log_file=ingest_log_file,
|
|
ipvlan=False,
|
|
mutate_interval=ini.mutate_interval or DEFAULT_MUTATE_INTERVAL
|
|
)
|
|
|
|
try:
|
|
new_decky_configs = _build_deckies_from_ini(
|
|
ini, subnet_cidr, gateway, host_ip, randomize_services, cli_mutate_interval=None
|
|
)
|
|
except ValueError as e:
|
|
raise HTTPException(status_code=400, detail=str(e))
|
|
|
|
# Merge deckies
|
|
existing_deckies_map = {d.name: d for d in config.deckies}
|
|
for new_decky in new_decky_configs:
|
|
existing_deckies_map[new_decky.name] = new_decky
|
|
|
|
config.deckies = list(existing_deckies_map.values())
|
|
|
|
# We call deploy(config) which regenerates docker-compose and runs `up -d --remove-orphans`.
|
|
try:
|
|
_deploy(config)
|
|
except Exception as e:
|
|
logging.getLogger("decnet.web.api").exception("Deployment failed: %s", e)
|
|
raise HTTPException(status_code=500, detail="Deployment failed. Check server logs for details.")
|
|
|
|
return {"message": "Deckies deployed successfully"}
|