server heathcheck
continuous-integration/drone Build is failing

This commit is contained in:
yves committed 2026-11-21 12:27:13 +01:00
1 parent 923f4e397e
commit 6ea7512af8
7 files changed
+212 -14

No files matched your search

+50 -3
View File
@@ -1,4 +1,7 @@
//! `meowsrv`: Meow v2 relay server.
//!
//! `meowsrv healthcheck` exits 0 when the local server answers `/healthz` (used by the
//! container image, which has no shell nor curl).
use std::sync::Arc;
@@ -10,8 +13,54 @@ use tokio::sync::broadcast;
const MAX_PER_MAILBOX: usize = 10_000;
/// `meowsrv healthcheck`: GET /healthz on the local listen port (MEOWSRV_LISTEN).
fn healthcheck() -> i32 {
use std::io::{Read, Write};
let listen = std::env::var("MEOWSRV_LISTEN").unwrap_or_else(|_| "127.0.0.1:8080".into());
let port = listen.rsplit(':').next().unwrap_or("8080");
let addr = format!("127.0.0.1:{port}");
let Ok(sock) = addr.parse() else { return 2 };
let timeout = std::time::Duration::from_secs(3);
let Ok(mut s) = std::net::TcpStream::connect_timeout(&sock, timeout) else {
return 1;
};
let _ = s.set_read_timeout(Some(timeout));
if s.write_all(b"GET /healthz HTTP/1.0\r\nHost: localhost\r\n\r\n").is_err() {
return 1;
}
let mut buf = [0u8; 16];
match s.read(&mut buf) {
Ok(n) if buf[..n].starts_with(b"HTTP/1.1 200") || buf[..n].starts_with(b"HTTP/1.0 200") => 0,
_ => 1,
}
}
/// Ctrl+C or SIGTERM (`docker stop`).
async fn shutdown_signal() {
#[cfg(unix)]
{
let mut term = match tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate()) {
Ok(s) => s,
Err(_) => {
let _ = tokio::signal::ctrl_c().await;
return;
}
};
tokio::select! {
_ = tokio::signal::ctrl_c() => {}
_ = term.recv() => {}
}
}
#[cfg(not(unix))]
let _ = tokio::signal::ctrl_c().await;
tracing::info!("shutting down");
}
#[tokio::main]
async fn main() -> anyhow::Result<()> {
if std::env::args().nth(1).as_deref() == Some("healthcheck") {
std::process::exit(healthcheck());
}
let cfg = Config::resolve(Args::parse())?;
tracing_subscriber::fmt()
.with_env_filter(tracing_subscriber::EnvFilter::new(&cfg.log))
@@ -42,9 +91,7 @@ async fn main() -> anyhow::Result<()> {
let listener = tokio::net::TcpListener::bind(&cfg.listen).await?;
tracing::info!("listening on {}", cfg.listen);
axum::serve(listener, router(state))
.with_graceful_shutdown(async {
let _ = tokio::signal::ctrl_c().await;
})
.with_graceful_shutdown(shutdown_signal())
.await?;
Ok(())
}