bumb dependencies

This commit is contained in:
Robin Appelman 2022-06-07 20:20:03 +02:00
commit 5a635578bb
4 changed files with 311 additions and 494 deletions

773
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -5,19 +5,19 @@ authors = ["Robin Appelman <robin@icewind.nl>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
prometheus-edge-detector = { version = "0.1", git = "https://github.com/icewind1991/prometheus-edge-detector", default-features = false, features = ["rustls-tls"] } prometheus-edge-detector = { version = "0.2", default-features = false, features = ["rustls-tls"] }
mdns = "1.1" mdns = { version = "1.1", git = "https://github.com/icewind1991/mdns", branch = "tokio-1" }
tokio = { version = "0.2.4", features = ["macros", "time", "fs"] } tokio = { version = "1.0", features = ["macros", "time", "fs", "rt-multi-thread"] }
main_error = "0.1.0" main_error = "0.1"
futures-util = "0.3.1" futures-util = "0.3"
reqwest = { version = "0.10.0", default-features = false, features = ["rustls-tls"] } reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
toml = "0.5" toml = "0.5.8"
log = "0.4" log = "0.4.16"
env_logger = "0.7" env_logger = "0.9.0"
err-derive = "0.2.1" err-derive = "0.3.1"
serde_json = "1.0.45" serde_json = "1.0.79"
rumqttc = "0.2.0" rumqttc = "0.12.0"
hostname = "0.3.1" hostname = "0.3.1"
[dev-dependencies] [dev-dependencies]

View file

@ -2,7 +2,7 @@ use crate::config::Config;
use crate::trigger::TriggerManager; use crate::trigger::TriggerManager;
use main_error::MainError; use main_error::MainError;
use tokio::fs::File; use tokio::fs::File;
use tokio::prelude::*; use tokio::io::AsyncReadExt;
mod config; mod config;
mod mdns; mod mdns;

View file

@ -10,7 +10,7 @@ use reqwest::Client;
use rumqttc::{AsyncClient, ClientError, Event, MqttOptions, Outgoing, QoS}; use rumqttc::{AsyncClient, ClientError, Event, MqttOptions, Outgoing, QoS};
use std::collections::HashMap; use std::collections::HashMap;
use std::time::{Duration, SystemTime}; use std::time::{Duration, SystemTime};
use tokio::time::delay_for; use tokio::time::sleep;
pub struct TriggerManager { pub struct TriggerManager {
http_client: Client, http_client: Client,
@ -81,7 +81,7 @@ impl TriggerManager {
trigger.name, elapsed, wait trigger.name, elapsed, wait
); );
let wait_delay = Duration::from_secs(wait); let wait_delay = Duration::from_secs(wait);
delay_for(wait_delay).await; sleep(wait_delay).await;
// verify that the previously found edge is still the most recent // verify that the previously found edge is still the most recent
match self.get_edge(&trigger.condition, delay).await { match self.get_edge(&trigger.condition, delay).await {
@ -96,11 +96,11 @@ impl TriggerManager {
{ {
error!("[{}]: {}", trigger.name, e); error!("[{}]: {}", trigger.name, e);
} }
delay_for(delay_duration).await; sleep(delay_duration).await;
} }
Err(e) => { Err(e) => {
error!("[{}]: {}", trigger.name, e); error!("[{}]: {}", trigger.name, e);
delay_for(error_delay).await; sleep(error_delay).await;
} }
_ => { _ => {
info!("[{}] Edge no longer valid", trigger.name); info!("[{}] Edge no longer valid", trigger.name);
@ -112,11 +112,11 @@ impl TriggerManager {
"[{}] No edge found, waiting {}s before looking for new edge", "[{}] No edge found, waiting {}s before looking for new edge",
trigger.name, delay trigger.name, delay
); );
delay_for(delay_duration).await; sleep(delay_duration).await;
} }
Err(e) => { Err(e) => {
error!("[{}]: {}", trigger.name, e); error!("[{}]: {}", trigger.name, e);
delay_for(error_delay).await; sleep(error_delay).await;
} }
} }
} }