wip

Author: auricom

Dockerfile.cross

@@ -9,8 +9,6 @@ ARG BUILDPLATFORM
 # Copy the pre-built binary based on the target platform
 COPY dist/bin/${TARGETPLATFORM}/ev-reth /usr/local/bin/ev-reth
 
-RUN apt-get update && apt-get install -y --no-install-recommends curl && rm -rf /var/lib/apt/lists/*
-
 # Expose default ports
 EXPOSE 8545 8546 30303 6060 9001
 

bin/ev-reth/src/main.rs

@@ -238,12 +238,15 @@ fn main() {
                     let shutdown_timeout = Duration::from_secs(30);
 
                     // Wait for the node to finish shutting down with a timeout
-                    // The handle will be dropped automatically, triggering shutdown
+                    // Drop the handle to trigger shutdown, then wait for the node exit future
+                    drop(handle);
+
+                    // Wait for the node to actually exit with a timeout
                     let shutdown_result = timeout(shutdown_timeout, async {
-                        // Drop the handle to trigger shutdown
-                        drop(handle);
-                        // Give the node time to clean up
-                        tokio::time::sleep(Duration::from_millis(100)).await;
+                        // The node should exit gracefully after dropping the handle
+                        // We can't wait on node_exit_future here since handle is dropped,
+                        // but dropping the handle should trigger proper cleanup
+                        tokio::time::sleep(Duration::from_millis(500)).await;
                         Ok(())
                     }).await;
 
@@ -254,7 +257,7 @@ fn main() {
                         }
                         Err(_) => {
                             tracing::warn!("=== EV-RETH: Node shutdown timed out after {:?} ===", shutdown_timeout);
-                            info!("=== EV-RETH: Node shutdown process completed ===");
+                            info!("=== EV-RETH: Forcing application exit ===");
                             Ok(())
                         }
                     }

bin/ev-reth/src/signal_tests.rs

@@ -13,14 +13,6 @@ mod tests {
         assert!(result.is_ok(), "Should be able to create SIGTERM handler");
     }
 
-    /// Test that SIGINT signal handler can be created (Unix only)
-    #[tokio::test]
-    #[cfg(unix)]
-    async fn test_sigint_handler_creation() {
-        let result = signal::unix::signal(signal::unix::SignalKind::interrupt());
-        assert!(result.is_ok(), "Should be able to create SIGINT handler");
-    }
-
     /// Test that Ctrl+C handler can be created
     #[tokio::test]
     async fn test_ctrl_c_handler_creation() {
@@ -89,34 +81,25 @@ mod tests {
         assert!(result.is_ok(), "Shutdown signal branch should be selected");
     }
 
-    /// Test that multiple signal handlers can be created simultaneously (Unix only)
+    /// Test that SIGTERM and Ctrl+C handlers can be created simultaneously (Unix only)
     #[tokio::test]
     #[cfg(unix)]
-    async fn test_multiple_signal_handlers() {
+    async fn test_sigterm_and_ctrl_c_handlers() {
         let sigterm_result = signal::unix::signal(signal::unix::SignalKind::terminate());
-        let sigint_result = signal::unix::signal(signal::unix::SignalKind::interrupt());
 
         assert!(
             sigterm_result.is_ok(),
             "Should be able to create SIGTERM handler"
         );
-        assert!(
-            sigint_result.is_ok(),
-            "Should be able to create SIGINT handler"
-        );
 
-        // Test that we can set up the same pattern as in main.rs
+        // Test that we can set up the same pattern as in main.rs (SIGTERM + ctrl_c)
         let shutdown_signal = async {
             let mut sigterm = sigterm_result.unwrap();
-            let mut sigint = sigint_result.unwrap();
 
             tokio::select! {
                 _ = sigterm.recv() => {
                     println!("=== TEST: SIGTERM received ===");
                 }
-                _ = sigint.recv() => {
-                    println!("=== TEST: SIGINT received ===");
-                }
                 _ = signal::ctrl_c() => {
                     println!("=== TEST: Ctrl+C received ===");
                 }