Compare commits

...
2 changed files with 12 additions and 36 deletions

View file

@ -290,42 +290,17 @@ fn reload_gateway_nginx() {
let state = nginx_active_state(); let state = nginx_active_state();
let success = match state.as_str() { let success = match state.as_str() {
"active" => { "active" => {
// nginx master is running — SIGHUP is the zero-downtime path. // nginx master is running — ask systemd to reload the unit
// `systemd-run --machine=hive-gateway --quiet --wait -- nginx // (SIGHUP to master, zero-downtime worker replacement).
// -s reload` runs the signal inside the container and exits // `systemctl -M hive-gateway reload nginx` lets systemd
// with the nginx exit code. `--` separates systemd-run flags // resolve the binary path; avoids the exit-203 (EXEC)
// from the command. // failure that `systemd-run -- nginx` hit on NixOS where
let status = std::process::Command::new("systemd-run") // the limited transient-unit PATH misses /run/current-system/sw/bin/.
.args([ let ok = gateway_systemctl(&["reload", "nginx"]);
"--machine=hive-gateway", if ok {
"--quiet", tracing::debug!("gateway nginx reload signal sent");
"--wait",
"--",
"nginx",
"-s",
"reload",
])
.status();
match status {
Ok(s) if s.success() => {
tracing::debug!("gateway nginx reload signal sent");
true
}
Ok(s) => {
tracing::warn!(
exit_code = ?s.code(),
"gateway nginx reload exited non-zero — will retry next poll tick"
);
false
}
Err(e) => {
tracing::warn!(
error = %e,
"failed to invoke systemd-run for gateway nginx reload — will retry"
);
false
}
} }
ok
} }
"failed" => { "failed" => {
// Unit hit start-limit (e.g. repeated nginx -t failures from // Unit hit start-limit (e.g. repeated nginx -t failures from

View file

@ -421,7 +421,8 @@ in
}; };
# nginx reload is triggered from the HOST side by hive-c0re # nginx reload is triggered from the HOST side by hive-c0re
# via `systemd-run --machine=hive-gateway nginx -s reload` # via `systemctl -M hive-gateway reload nginx` — lets systemd
# resolve the nginx binary path, avoiding exit-203 EXEC failures.
# after each agents.conf write. A path unit watching the # after each agents.conf write. A path unit watching the
# bind-mounted file inside the container was tried first # bind-mounted file inside the container was tried first
# (A path unit inside the container was tried but IN_MOVED_TO from an atomic rename on the host # (A path unit inside the container was tried but IN_MOVED_TO from an atomic rename on the host