feat(swarm): add decnet forwarder CLI to run syslog-over-TLS forwarder
The forwarder module existed but had no runner — closes that gap so the worker-side process can actually be launched and runs isolated from the agent (asyncio.run + SIGTERM/SIGINT → stop_event). Guards: refuses to start without a worker cert bundle or a resolvable master host ($DECNET_SWARM_MASTER_HOST or --master-host).
This commit is contained in:
@@ -182,6 +182,68 @@ def agent(
|
|||||||
raise typer.Exit(rc)
|
raise typer.Exit(rc)
|
||||||
|
|
||||||
|
|
||||||
|
@app.command()
|
||||||
|
def forwarder(
|
||||||
|
master_host: Optional[str] = typer.Option(None, "--master-host", help="Master listener hostname/IP (default: $DECNET_SWARM_MASTER_HOST)"),
|
||||||
|
master_port: int = typer.Option(6514, "--master-port", help="Master listener TCP port (RFC 5425 default 6514)"),
|
||||||
|
log_file: Optional[str] = typer.Option(DECNET_INGEST_LOG_FILE, "--log-file", help="Local RFC 5424 file to tail and forward"),
|
||||||
|
agent_dir: Optional[str] = typer.Option(None, "--agent-dir", help="Worker cert bundle dir (default: ~/.decnet/agent)"),
|
||||||
|
state_db: Optional[str] = typer.Option(None, "--state-db", help="Forwarder offset SQLite path (default: <agent_dir>/forwarder.db)"),
|
||||||
|
poll_interval: float = typer.Option(0.5, "--poll-interval", help="Seconds between log file stat checks"),
|
||||||
|
daemon: bool = typer.Option(False, "--daemon", "-d", help="Detach to background as a daemon process"),
|
||||||
|
) -> None:
|
||||||
|
"""Run the worker-side syslog-over-TLS forwarder (RFC 5425, mTLS to master:6514)."""
|
||||||
|
import asyncio
|
||||||
|
import pathlib
|
||||||
|
from decnet.env import DECNET_SWARM_MASTER_HOST
|
||||||
|
from decnet.swarm import pki
|
||||||
|
from decnet.swarm.log_forwarder import ForwarderConfig, run_forwarder
|
||||||
|
|
||||||
|
resolved_host = master_host or DECNET_SWARM_MASTER_HOST
|
||||||
|
if not resolved_host:
|
||||||
|
console.print("[red]--master-host is required (or set DECNET_SWARM_MASTER_HOST).[/]")
|
||||||
|
raise typer.Exit(2)
|
||||||
|
|
||||||
|
resolved_agent_dir = pathlib.Path(agent_dir) if agent_dir else pki.DEFAULT_AGENT_DIR
|
||||||
|
if not (resolved_agent_dir / "worker.crt").exists():
|
||||||
|
console.print(f"[red]No worker cert bundle at {resolved_agent_dir} — enroll from the master first.[/]")
|
||||||
|
raise typer.Exit(2)
|
||||||
|
|
||||||
|
if not log_file:
|
||||||
|
console.print("[red]--log-file is required.[/]")
|
||||||
|
raise typer.Exit(2)
|
||||||
|
|
||||||
|
cfg = ForwarderConfig(
|
||||||
|
log_path=pathlib.Path(log_file),
|
||||||
|
master_host=resolved_host,
|
||||||
|
master_port=master_port,
|
||||||
|
agent_dir=resolved_agent_dir,
|
||||||
|
state_db=pathlib.Path(state_db) if state_db else None,
|
||||||
|
)
|
||||||
|
|
||||||
|
if daemon:
|
||||||
|
log.info("forwarder daemonizing master=%s:%d log=%s", resolved_host, master_port, log_file)
|
||||||
|
_daemonize()
|
||||||
|
|
||||||
|
log.info("forwarder command invoked master=%s:%d log=%s", resolved_host, master_port, log_file)
|
||||||
|
console.print(f"[green]Starting DECNET forwarder → {resolved_host}:{master_port} (mTLS)...[/]")
|
||||||
|
|
||||||
|
async def _main() -> None:
|
||||||
|
stop = asyncio.Event()
|
||||||
|
loop = asyncio.get_running_loop()
|
||||||
|
for sig in (signal.SIGTERM, signal.SIGINT):
|
||||||
|
try:
|
||||||
|
loop.add_signal_handler(sig, stop.set)
|
||||||
|
except (NotImplementedError, RuntimeError): # pragma: no cover
|
||||||
|
pass
|
||||||
|
await run_forwarder(cfg, poll_interval=poll_interval, stop_event=stop)
|
||||||
|
|
||||||
|
try:
|
||||||
|
asyncio.run(_main())
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
@app.command()
|
@app.command()
|
||||||
def deploy(
|
def deploy(
|
||||||
mode: str = typer.Option("unihost", "--mode", "-m", help="Deployment mode: unihost | swarm"),
|
mode: str = typer.Option("unihost", "--mode", "-m", help="Deployment mode: unihost | swarm"),
|
||||||
|
|||||||
39
tests/swarm/test_cli_forwarder.py
Normal file
39
tests/swarm/test_cli_forwarder.py
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
"""CLI surface for `decnet forwarder`. Only guard clauses — the async
|
||||||
|
loop itself is covered by tests/swarm/test_log_forwarder.py."""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import pathlib
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
from typer.testing import CliRunner
|
||||||
|
|
||||||
|
from decnet.cli import app
|
||||||
|
|
||||||
|
|
||||||
|
runner = CliRunner()
|
||||||
|
|
||||||
|
|
||||||
|
def test_forwarder_requires_master_host(monkeypatch: pytest.MonkeyPatch, tmp_path: pathlib.Path) -> None:
|
||||||
|
monkeypatch.delenv("DECNET_SWARM_MASTER_HOST", raising=False)
|
||||||
|
# Also patch the already-imported module-level constant.
|
||||||
|
monkeypatch.setattr("decnet.env.DECNET_SWARM_MASTER_HOST", None, raising=False)
|
||||||
|
result = runner.invoke(app, ["forwarder", "--log-file", str(tmp_path / "decnet.log")])
|
||||||
|
assert result.exit_code == 2
|
||||||
|
assert "master-host" in result.output
|
||||||
|
|
||||||
|
|
||||||
|
def test_forwarder_requires_bundle(monkeypatch: pytest.MonkeyPatch, tmp_path: pathlib.Path) -> None:
|
||||||
|
agent_dir = tmp_path / "agent" # empty
|
||||||
|
log_file = tmp_path / "decnet.log"
|
||||||
|
log_file.write_text("")
|
||||||
|
result = runner.invoke(
|
||||||
|
app,
|
||||||
|
[
|
||||||
|
"forwarder",
|
||||||
|
"--master-host", "127.0.0.1",
|
||||||
|
"--log-file", str(log_file),
|
||||||
|
"--agent-dir", str(agent_dir),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
assert result.exit_code == 2
|
||||||
|
assert "bundle" in result.output
|
||||||
Reference in New Issue
Block a user