Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion crates/server-actix/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ async fn handle_healthz(
.get(EXO_HEALTHZ_QUERY)
.map(|value| value.replace("\\$", "$"))
.unwrap_or_else(|| default_query.clone());
let mut used_default_query = query == default_query;
let mut response_pointer = env.get(EXO_HEALTHZ_RESPONSE_JSON_POINTER);
let variables = match env.get(EXO_HEALTHZ_VARIABLES) {
Some(raw) => match expand_env_placeholders(&raw, env) {
Expand All @@ -149,13 +150,15 @@ async fn handle_healthz(
err
);
query = default_query;
used_default_query = true;
response_pointer = None;
None
}
},
Err(err) => {
tracing::warn!("{}; falling back to default health check", err);
query = default_query;
used_default_query = true;
response_pointer = None;
None
}
Expand All @@ -167,6 +170,7 @@ async fn handle_healthz(
EXO_HEALTHZ_VARIABLES
);
query = default_query;
used_default_query = true;
response_pointer = None;
}
None
Expand All @@ -182,12 +186,18 @@ async fn handle_healthz(
)
.await
{
Ok(()) => HttpResponse::Ok().json(json!({ "status": "ok" })),
Ok(()) => HttpResponse::Ok().json(json!({
"status": "ok",
"check": "graphql",
"query": if used_default_query { "default" } else { "custom" },
})),
Err(err) => {
tracing::error!("GraphQL health check failed: {}", err);
HttpResponse::ServiceUnavailable().json(json!({
"status": "error",
"message": err,
"check": "graphql",
"query": if used_default_query { "default" } else { "custom" },
}))
}
}
Expand Down
Loading