jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 19:09:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: accept concurrent prometheus connections (#9459)

Browse Source
This commit is contained in:
Matthias Seitz
2024-07-11 22:15:09 +02:00
committed by GitHub
parent 22df39a100
commit 95bde32cdf
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
crates/node/core/src/metrics/prometheus_exporter.rs
View File

@ -2,7 +2,6 @@
use crate::metrics::version_metrics::VersionInfo;
use eyre::WrapErr;
use futures::{future::FusedFuture, FutureExt};
use http::Response;
use metrics::describe_gauge;
use metrics_exporter_prometheus::{PrometheusBuilder, PrometheusHandle};
@ -65,14 +64,18 @@ async fn start_endpoint<F: Hook + 'static>(
let listener =
tokio::net::TcpListener::bind(listen_addr).await.wrap_err("Could not bind to address")?;
task_executor.spawn_with_graceful_shutdown_signal(|signal| async move {
let mut shutdown = signal.ignore_guard().fuse();
task_executor.spawn_with_graceful_shutdown_signal(|mut signal| async move {
loop {
let io = match listener.accept().await {
Ok((stream, _remote_addr)) => stream,
Err(err) => {
tracing::error!(%err, "failed to accept connection");
continue;
let io = tokio::select! {
_ = &mut signal => break,
io = listener.accept() => {
match io {
Ok((stream, _remote_addr)) => stream,
Err(err) => {
tracing::error!(%err, "failed to accept connection");
continue;
}
}
}
};
@ -84,15 +87,15 @@ async fn start_endpoint<F: Hook + 'static>(
async move { Ok::<_, Infallible>(Response::new(metrics)) }
});
if let Err(error) =
jsonrpsee::server::serve_with_graceful_shutdown(io, service, &mut shutdown).await
{
tracing::debug!(%error, "failed to serve request")
}
if shutdown.is_terminated() {
break;
}
let mut shutdown = signal.clone().ignore_guard();
tokio::task::spawn(async move {
if let Err(error) =
jsonrpsee::server::serve_with_graceful_shutdown(io, service, &mut shutdown)
.await
{
tracing::debug!(%error, "failed to serve request")
}
});
}
});