chore: try one more time

Author: kioqq

Diff for: Dockerfile

@@ -54,7 +54,7 @@ RUN --mount=type=cache,target=/app/target \
 FROM scratch
 
 # Copy compiled application
-COPY --from=builder /app/target/x86_64-unknown-linux-musl/release/klickhouse_example /klickhouse_example
+COPY --from=builder /app/klickhouse_example /klickhouse_example
 # Copy application config
 COPY ./confik.toml .
 

Diff for: aarch64.Dockerfile

@@ -53,7 +53,9 @@ RUN --mount=type=cache,target=/app/target \
 FROM scratch
 
 # copy compiled application
-COPY --from=builder /app/target/aarch64-unknown-linux-musl/release/klickhouse_example /klickhouse_example
+COPY --from=builder /app/klickhouse_example /klickhouse_example
+# Copy application config
+COPY ./confik.toml .
 
 # specify that the application is started as PID 1
 ENTRYPOINT ["/klickhouse_example"]

Diff for: src/web/app_state.rs

@@ -32,9 +32,15 @@ impl AppState {
             .await
             .map_err(|e| eyre!("Failed to connect to Clickhouse: {}", e))?;
 
+        pool.check_pool().await?;
+
         Ok(pool)
     }
 
+    pub async fn check_clickhouse_connection(&self) -> Result<()> {
+        self.clickhouse_pool.check_pool().await
+    }
+
     pub fn config(&self) -> &AppConfig {
         &self.config
     }

Diff for: src/web/global_panic_handler.rs

@@ -16,8 +16,6 @@ pub fn setup_global_panic_handler(app_state: Data<AppState>) {
             .map(ToString::to_string)
             .unwrap_or_else(|| "Unknown panic".to_string());
 
-        println!("Global panic handler called #2");
-
         tokio::task::spawn(async move {
             // Create log
             let log = WebServerLog {
@@ -32,8 +30,6 @@ pub fn setup_global_panic_handler(app_state: Data<AppState>) {
                 response_time: 0.0,
             };
 
-            println!("Global panic handler called #3");
-
             // Write log to Clickhouse
             if let Err(e) = app_state.ch_logger().log(log).await {
                 eprintln!("Failed to log panic to ClickHouse: {:?}", e);

Diff for: src/web/handlers/mod.rs

@@ -1,16 +1,12 @@
-use actix_web::{get, HttpResponse, Responder};
+use crate::web::app_state::AppState;
+use actix_web::{get, web, HttpResponse, Responder};
 use tracing_actix_web::RequestId;
 
 #[get("/")]
 pub async fn index(request_id: RequestId) -> impl Responder {
     format!("request_id: {}", request_id)
 }
 
-#[get("/health")]
-pub async fn health() -> impl Responder {
-    "I'm alive!"
-}
-
 #[get("/fail")]
 #[allow(clippy::unnecessary_literal_unwrap)]
 pub async fn fail_endpoint() -> impl Responder {
@@ -19,3 +15,11 @@ pub async fn fail_endpoint() -> impl Responder {
     let value = result.unwrap();
     HttpResponse::Ok().body(format!("Value: {}", value))
 }
+
+#[get("/health")]
+pub async fn health(app_state: web::Data<AppState>) -> impl Responder {
+    match app_state.check_clickhouse_connection().await {
+        Ok(_) => HttpResponse::Ok().body("I'm alive!"),
+        Err(e) => HttpResponse::InternalServerError().body(format!("Error: {}", e)),
+    }
+}

Diff for: src/web/startup.rs

@@ -13,15 +13,16 @@ use crate::web::global_panic_handler::setup_global_panic_handler;
 use crate::web::handlers::{fail_endpoint, health, index};
 
 pub async fn run_serve(config: AppConfig) -> Result<actix_web::dev::Server> {
-    let app_state = web::Data::new(AppState::build(config).await?);
-    setup_global_panic_handler(app_state.clone());
+    let app_state = AppState::build(config).await?;
+    let data_app_state = web::Data::new(app_state.clone());
+    setup_global_panic_handler(data_app_state.clone());
 
     let port = app_state.config().http_port;
     let addr = format!("0.0.0.0:{}", port);
 
     let server = HttpServer::new(move || {
         App::new()
-            .app_data(app_state.clone())
+            .app_data(data_app_state.clone())
             .wrap(TracingLogger::default())
             .wrap(NormalizePath::new(
                 actix_web::middleware::TrailingSlash::Trim,