diff options
-rw-r--r-- | assets/index.js | 4 | ||||
-rw-r--r-- | src/api.rs | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/assets/index.js b/assets/index.js index 173ed72..246364f 100644 --- a/assets/index.js +++ b/assets/index.js @@ -33,11 +33,11 @@ function updateStatus(check) { statusElm.setAttribute("class", "ok"); break; case "fail": - issuesElm.textContent = `${check.output} issues detected`; + issuesElm.textContent = check.output; statusElm.setAttribute("class", "error"); break; case "warn": - issuesElm.textContent = `${check.output} warnings detected`; + issuesElm.textContent = check.output; statusElm.setAttribute("class", "warning"); break; default: @@ -3,7 +3,7 @@ use std::collections::HashMap; use axum::{extract::State, response::IntoResponse, Json}; use serde::{Deserialize, Serialize}; -use crate::{service::Services, Error, Status}; +use crate::{service::Services, Status}; pub mod services; @@ -13,11 +13,11 @@ pub fn router() -> axum::Router<Services> { axum::Router::new() .route("/healthcheck", get(healthcheck)) .merge(services::router()) - .fallback(fallback) } #[derive(Debug, Clone, Default, Serialize, Deserialize)] pub struct Health { + #[serde(flatten)] pub status: Status, pub checks: HashMap<String, Status>, } @@ -55,7 +55,3 @@ pub async fn healthcheck(State(services): State<Services>) -> Health { Health { status, checks } } - -pub async fn fallback(uri: axum::http::Uri) -> Error { - Error::RouteNotFound(uri) -} |