1
0
mirror of https://github.com/pcvolkmer/checkbar.git synced 2025-04-19 11:06:50 +00:00

Move check_host to checker mod

This commit is contained in:
Paul-Christian Volkmer 2023-02-12 18:48:00 +01:00
parent 84fee2495a
commit 56d2961527
2 changed files with 14 additions and 14 deletions

View File

@ -11,7 +11,15 @@ use serde_json::json;
pub use crate::checker::actuator::Checker as ActuatorChecker; pub use crate::checker::actuator::Checker as ActuatorChecker;
pub use crate::checker::http::Checker as HttpChecker; pub use crate::checker::http::Checker as HttpChecker;
pub use crate::checker::tcp::Checker as TcpChecker; 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 struct CheckResult {
pub name: String, pub name: String,

View File

@ -1,3 +1,6 @@
mod checker;
mod config;
use std::process; use std::process;
use std::time::Duration; use std::time::Duration;
@ -5,11 +8,8 @@ use serde::Deserialize;
use serde_json::json; use serde_json::json;
use tokio::task; use tokio::task;
use crate::checker::{ActuatorChecker, CheckResult, HttpBasedChecker, HttpChecker, TcpChecker}; use crate::checker::check_host;
use crate::config::{CheckConfig, CheckType, Config}; use crate::config::{CheckConfig, Config};
mod checker;
mod config;
#[derive(Deserialize)] #[derive(Deserialize)]
struct ClickEvent { struct ClickEvent {
@ -17,14 +17,6 @@ struct ClickEvent {
button: u8, 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]) { async fn print_states(check_configs: &[CheckConfig]) {
print!("["); print!("[");
let mut entries = vec![]; let mut entries = vec![];