From 56d29615279d58755343e543e9cb616a57643758 Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Sun, 12 Feb 2023 18:48:00 +0100 Subject: [PATCH] Move check_host to checker mod --- src/checker/mod.rs | 10 +++++++++- src/main.rs | 18 +++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/checker/mod.rs b/src/checker/mod.rs index b82cfb6..0d8f389 100644 --- a/src/checker/mod.rs +++ b/src/checker/mod.rs @@ -11,7 +11,15 @@ use serde_json::json; pub use crate::checker::actuator::Checker as ActuatorChecker; pub use crate::checker::http::Checker as HttpChecker; pub use crate::checker::tcp::Checker as TcpChecker; -use crate::config::{CheckConfig, Config}; +use crate::config::{CheckConfig, CheckType, Config}; + +pub async fn check_host(check_config: &CheckConfig) -> CheckResult { + match check_config.check_type { + Some(CheckType::Actuator) => ActuatorChecker::new(check_config).check().await, + Some(CheckType::Tcp) => TcpChecker::new(check_config).check().await, + _ => HttpChecker::new(check_config).check().await, + } +} pub struct CheckResult { pub name: String, diff --git a/src/main.rs b/src/main.rs index fa736a5..b78e950 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,3 +1,6 @@ +mod checker; +mod config; + use std::process; use std::time::Duration; @@ -5,11 +8,8 @@ use serde::Deserialize; use serde_json::json; use tokio::task; -use crate::checker::{ActuatorChecker, CheckResult, HttpBasedChecker, HttpChecker, TcpChecker}; -use crate::config::{CheckConfig, CheckType, Config}; - -mod checker; -mod config; +use crate::checker::check_host; +use crate::config::{CheckConfig, Config}; #[derive(Deserialize)] struct ClickEvent { @@ -17,14 +17,6 @@ struct ClickEvent { button: u8, } -async fn check_host(check_config: &CheckConfig) -> CheckResult { - match check_config.check_type { - Some(CheckType::Actuator) => ActuatorChecker::new(check_config).check().await, - Some(CheckType::Tcp) => TcpChecker::new(check_config).check().await, - _ => HttpChecker::new(check_config).check().await, - } -} - async fn print_states(check_configs: &[CheckConfig]) { print!("["); let mut entries = vec![];