Allow redirect as healthy response

Author: marlonbaeten

Cargo.toml

@@ -9,13 +9,13 @@ axum = { version = "0.8", features = ["macros", "ws"] }
 axum-extra = { version = "0.12", default-features = false, features = [
     "cookie-private",
 ] }
-bytes = "1.8"
+bytes = "1.11"
 chrono = { version = "0.4", features = ["serde"] }
 config = "0.15"
 constant_time_eq = "0.4"
 cookie = "0.18"
 futures = "0.3"
-hyper = { version = "1.0", features = ["full"] }
+hyper = { version = "1.9", features = ["full"] }
 hyper-util = { version = "0.1", features = ["client-legacy"] }
 oauth2 = "5.0"
 parking_lot = "0.12"

src/monitor.rs

@@ -39,14 +39,15 @@ impl SystemMonitor {
 // Send regular updates to the event manager and thereby the connected clients
 pub async fn send_updates(state: AppState) {
     let mut system = System::new_all();
-    let last_cleanup = std::time::Instant::now();
+    let mut last_cleanup = std::time::Instant::now();
 
     loop {
         // if the last cleanup was more than a day ago, run cleanup
-        if last_cleanup.elapsed().as_secs() > 24 * 60 * 60
-            && let Err(e) = executable::remove_unused_executables(state.clone()).await
-        {
-            error!("Failed to remove unused executables: {e:?}");
+        if last_cleanup.elapsed().as_secs() > 24 * 60 * 60 {
+            if let Err(e) = executable::remove_unused_executables(state.clone()).await {
+                error!("Failed to remove unused executables: {e:?}");
+            }
+            last_cleanup = std::time::Instant::now();
         }
 
         system.refresh_all();

src/services.rs

@@ -36,7 +36,7 @@ impl ServiceManager {
             .map(|service| service.into())
             .collect::<Vec<ServiceData>>();
 
-        services.sort_by(|a, b| b.created_at.cmp(&a.created_at));
+        services.sort_by_key(|s| std::cmp::Reverse(s.created_at));
 
         services
     }
@@ -91,13 +91,14 @@ impl ServiceManager {
 
         let client = reqwest::Client::builder()
             .timeout(Duration::from_secs(1))
+            .redirect(reqwest::redirect::Policy::none())
             .build()?;
 
         for i in 0..10 {
             info!("Checking ({i}) service on port {}", port);
 
             if let Ok(response) = client.get(format!("http://127.0.0.1:{port}/")).send().await
-                && response.status().is_success()
+                && (response.status().is_success() || response.status().is_redirection())
             {
                 self.set_service_state(name, ServiceState::Running, None);
 

src/upload.rs

@@ -91,11 +91,22 @@ pub async fn upload_handler(
         executables: state.services.get_executables(),
     });
 
-    if state.github.update(state.config).await.is_ok() {
-        state.channel.send(Event::GithubState {
-            payload: state.github.get_state(),
-        });
-    }
+    // update GitHub state 1 minute after the upload
+    let delayed_state = state.clone();
+    tokio::spawn(async move {
+        tokio::time::sleep(std::time::Duration::from_secs(60)).await;
+
+        if delayed_state
+            .github
+            .update(delayed_state.config)
+            .await
+            .is_ok()
+        {
+            delayed_state.channel.send(Event::GithubState {
+                payload: delayed_state.github.get_state(),
+            });
+        }
+    });
 
     Ok((
         StatusCode::CREATED,