Merge pull request #159 from joesturge/157-failed-to-proxyapplication-unhealthy

fix: app no longer going unhealthy when any lazymc error occurs, and …

Author: joesturge

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Container going unhealthy when any error occurs in lazymc, it probably should not be doing that
+- Fixed test/bot by limiting rust nightly to 2024-10-01
+
 ## [2.7.0] - 2024-11-08
 
 ### Build

src/entrypoint/mod.rs

@@ -99,9 +99,6 @@ fn handle_log(group: &String, level: &Level, message: &String) {
             docker::stop(group.clone());
             info!(target: "lazymc-docker-proxy::entrypoint", "{} server container forcefully stopped", group.clone());
         }
-        (Level::Error, _) => {
-            health::unhealthy();
-        }
         _ => {}
     }
 }

tests/bats/static-network/docker-compose.yaml

@@ -41,6 +41,7 @@ services:
     environment:
       EULA: "TRUE"
       ONLINE_MODE: "FALSE"
+      VERSION: "1.21.1"
     volumes:
       - data:/data
 

tests/bats/static-network/static-network.bats

@@ -28,13 +28,13 @@ project="./tests/bats/static-network"
     wait_for_log "lazymc-static-network" "address = \"172.21.0.3:25565\""
 
     # wait for lazymc-docker-proxy to to be ready
-    wait_for_formatted_log "lazymc-static-network" "INFO" "lazymc-docker-proxy::health" "Application is healthy."
+    wait_for_formatted_log "lazymc-static-network" "INFO" "lazymc-docker-proxy::health" "Application is healthy." 300
 
     # start the client container
     start_container mc-client-static-network
 
     # wait for lazymc to start the server for the client
-    wait_for_formatted_log "lazymc-static-network" "INFO" "mc::lazymc" "Starting server for 'test-bot'..."
+    wait_for_formatted_log "lazymc-static-network" "INFO" "mc::lazymc" "Starting server for 'test-bot'..." 300
 
     # wait for the server to be online
     wait_for_formatted_log "lazymc-static-network" "INFO" "mc::lazymc::monitor" "Server is now online" 300

tests/bats/unexpected-server-state-recovery/docker-compose.yaml

@@ -39,6 +39,7 @@ services:
     environment:
       EULA: "TRUE"
       ONLINE_MODE: "FALSE"
+      VERSION: "1.21.1"
     volumes:
       - data:/data
 

tests/bats/unexpected-server-state-recovery/unexpected-server-state-recovery.bats

@@ -22,7 +22,7 @@ project="./tests/bats/unexpected-server-state-recovery"
     #
 
     # wait for lazymc-docker-proxy to to be ready
-    wait_for_formatted_log "lazymc-unexpected-server-state-recovery" "INFO" "lazymc-docker-proxy::health" "Application is healthy."
+    wait_for_formatted_log "lazymc-unexpected-server-state-recovery" "INFO" "lazymc-docker-proxy::health" "Application is healthy." 300
 
     # wait for lazymc to be ready
     wait_for_formatted_log "lazymc-unexpected-server-state-recovery" "INFO" "mc::lazymc" "Proxying public 0.0.0.0:25565 to server 172.21.0.3:25565"
@@ -39,7 +39,7 @@ project="./tests/bats/unexpected-server-state-recovery"
     start_container mc-client-unexpected-server-state-recovery
 
     # wait for test-bot to connect
-    wait_for_log "mc-unexpected-server-state-recovery" "test-bot joined the game"
+    wait_for_log "mc-unexpected-server-state-recovery" "test-bot joined the game" 300
 
     # stop the client container
     stop_container mc-client-unexpected-server-state-recovery