Skip to content

Commit

Permalink
refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
hanneary committed Dec 18, 2024
1 parent eb0c78b commit 1561335
Showing 1 changed file with 18 additions and 14 deletions.
32 changes: 18 additions & 14 deletions control-plane/src/health.rs
Original file line number Diff line number Diff line change
Expand Up @@ -127,20 +127,7 @@ impl HealthCheckServer {
loop {
let stream = tcp_server.accept().await?;

let cp_state = if let Ok(exited_service) = self.shutdown_receiver.try_recv() {
self.exited_services.push(exited_service);
ControlPlaneState::Error(format!(
"Critical Control Plane services have exited: {}",
self.serialize_exited_services()
))
} else if !self.exited_services.is_empty() {
ControlPlaneState::Error(format!(
"Critical Control Plane services have exited: {}",
self.serialize_exited_services()
))
} else {
ControlPlaneState::Ok
};
let cp_state = self.get_control_plane_state();

let service = hyper::service::service_fn({
let cp_state = cp_state.clone();
Expand Down Expand Up @@ -175,6 +162,23 @@ impl HealthCheckServer {
}
}

fn get_control_plane_state(&mut self) -> ControlPlaneState {
if let Ok(exited_service) = self.shutdown_receiver.try_recv() {
self.exited_services.push(exited_service);
ControlPlaneState::Error(format!(
"Critical Control Plane services have exited: {}",
self.serialize_exited_services()
))
} else if !self.exited_services.is_empty() {
ControlPlaneState::Error(format!(
"Critical Control Plane services have exited: {}",
self.serialize_exited_services()
))
} else {
ControlPlaneState::Ok
}
}

fn serialize_exited_services(&self) -> String {
self.exited_services
.iter()
Expand Down

0 comments on commit 1561335

Please sign in to comment.