Merge branch 'master' into dp-add-denylist-for-unwanted-networks

This commit is contained in:
David Palm
2021-03-26 07:43:38 +01:00
6 changed files with 439 additions and 1325 deletions
+5 -5
View File
@@ -76,7 +76,7 @@ impl From<&LogLevel> for log::LevelFilter {
}
/// Entry point for connecting nodes
#[get("/submit/")]
#[get("/submit")]
async fn node_route(
req: HttpRequest,
stream: web::Payload,
@@ -102,7 +102,7 @@ async fn node_route(
}
/// Entry point for connecting feeds
#[get("/feed/")]
#[get("/feed")]
async fn feed_route(
req: HttpRequest,
stream: web::Payload,
@@ -116,7 +116,7 @@ async fn feed_route(
}
/// Entry point for network state dump
#[get("/network_state/{chain}/{nid}/")]
#[get("/network_state/{chain}/{nid}")]
async fn state_route(
path: web::Path<(Box<str>, NodeId)>,
aggregator: web::Data<Addr<Aggregator>>,
@@ -145,7 +145,7 @@ async fn state_route(
}
/// Entry point for health check monitoring bots
#[get("/health/")]
#[get("/health")]
async fn health(aggregator: web::Data<Addr<Aggregator>>) -> Result<HttpResponse, Error> {
match aggregator.send(GetHealth).await {
Ok(count) => {
@@ -184,7 +184,7 @@ async fn main() -> std::io::Result<()> {
.service(state_route)
.service(health)
})
.bind(format!("{}", opts.socket))?
.bind(opts.socket)?
.run()
.await
}