From 9fa3951fd49ad643e9e8040cda87e019281aacb7 Mon Sep 17 00:00:00 2001 From: sksat Date: Wed, 30 Oct 2024 19:19:45 +0900 Subject: [PATCH 1/3] add healthcheck endpoint --- src/main.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main.rs b/src/main.rs index 154156c..5d5ce4a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -199,6 +199,7 @@ async fn main() -> std::io::Result<()> { .app_data(web::Data::new(Arc::new(cfg.clone()))) // memo: https://github.com/actix/actix-web/issues/1454#issuecomment-867897725 .app_data(web::Data::new(Arc::new(opt.clone()))) .service(web::resource("/webhook").route(web::post().to(webhook))) + .service(web::resource("/healthcheck").route(web::get().to(|| HttpResponse::Ok()))) }) .bind(format!("0.0.0.0:{}", port))? .run() From 714ab00db938656c70c95ab51aca2e244c722785 Mon Sep 17 00:00:00 2001 From: sksat Date: Wed, 30 Oct 2024 19:20:21 +0900 Subject: [PATCH 2/3] cargo fmt --- src/main.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 5d5ce4a..0314435 100644 --- a/src/main.rs +++ b/src/main.rs @@ -246,7 +246,9 @@ impl Rule { let include_query_result = Rule::match_results(&self.query, payload).iter().all(|&r| r); if let Some(exclude_query) = &self.exclude_query { - let exclude_query_result = Rule::match_results(exclude_query, payload).iter().any(|&r| r); + let exclude_query_result = Rule::match_results(exclude_query, payload) + .iter() + .any(|&r| r); include_query_result && !exclude_query_result } else { include_query_result From a55bfa355bd43171fc5a5601d24fef83ded2506c Mon Sep 17 00:00:00 2001 From: sksat Date: Wed, 30 Oct 2024 19:26:48 +0900 Subject: [PATCH 3/3] fix from clippy --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 0314435..4a64a21 100644 --- a/src/main.rs +++ b/src/main.rs @@ -199,7 +199,7 @@ async fn main() -> std::io::Result<()> { .app_data(web::Data::new(Arc::new(cfg.clone()))) // memo: https://github.com/actix/actix-web/issues/1454#issuecomment-867897725 .app_data(web::Data::new(Arc::new(opt.clone()))) .service(web::resource("/webhook").route(web::post().to(webhook))) - .service(web::resource("/healthcheck").route(web::get().to(|| HttpResponse::Ok()))) + .service(web::resource("/healthcheck").route(web::get().to(HttpResponse::Ok))) }) .bind(format!("0.0.0.0:{}", port))? .run()