Skip to content

Commit f265651

Browse files
authored
Merge pull request #41 from Virtual-Repetitions/health-check
update healthz check response to include custom/default query
2 parents c7833c8 + 2c00bca commit f265651

1 file changed

Lines changed: 11 additions & 1 deletion

File tree

crates/server-actix/src/lib.rs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ async fn handle_healthz(
137137
.get(EXO_HEALTHZ_QUERY)
138138
.map(|value| value.replace("\\$", "$"))
139139
.unwrap_or_else(|| default_query.clone());
140+
let mut used_default_query = query == default_query;
140141
let mut response_pointer = env.get(EXO_HEALTHZ_RESPONSE_JSON_POINTER);
141142
let variables = match env.get(EXO_HEALTHZ_VARIABLES) {
142143
Some(raw) => match expand_env_placeholders(&raw, env) {
@@ -149,13 +150,15 @@ async fn handle_healthz(
149150
err
150151
);
151152
query = default_query;
153+
used_default_query = true;
152154
response_pointer = None;
153155
None
154156
}
155157
},
156158
Err(err) => {
157159
tracing::warn!("{}; falling back to default health check", err);
158160
query = default_query;
161+
used_default_query = true;
159162
response_pointer = None;
160163
None
161164
}
@@ -167,6 +170,7 @@ async fn handle_healthz(
167170
EXO_HEALTHZ_VARIABLES
168171
);
169172
query = default_query;
173+
used_default_query = true;
170174
response_pointer = None;
171175
}
172176
None
@@ -182,12 +186,18 @@ async fn handle_healthz(
182186
)
183187
.await
184188
{
185-
Ok(()) => HttpResponse::Ok().json(json!({ "status": "ok" })),
189+
Ok(()) => HttpResponse::Ok().json(json!({
190+
"status": "ok",
191+
"check": "graphql",
192+
"query": if used_default_query { "default" } else { "custom" },
193+
})),
186194
Err(err) => {
187195
tracing::error!("GraphQL health check failed: {}", err);
188196
HttpResponse::ServiceUnavailable().json(json!({
189197
"status": "error",
190198
"message": err,
199+
"check": "graphql",
200+
"query": if used_default_query { "default" } else { "custom" },
191201
}))
192202
}
193203
}

0 commit comments

Comments
 (0)