switch to toml for config and improve error handling

Cargo.lock

@@ -1,5 +1,13 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+[[package]]
+name = "aho-corasick"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.26"
@@ -24,6 +32,16 @@ dependencies = [
  "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "autocfg"
 version = "0.1.7"
@@ -108,6 +126,18 @@ dependencies = [
  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "env_logger"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "err-derive"
 version = "0.2.1"
@@ -237,6 +267,14 @@ dependencies = [
  "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "http"
 version = "0.2.0"
@@ -261,6 +299,14 @@ name = "httparse"
 version = "1.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "humantime"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "hyper"
 version = "0.13.1"
@@ -596,16 +642,18 @@ dependencies = [
 name = "prometheus-edge-trigger"
 version = "0.1.0"
 dependencies = [
+ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "err-derive 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "main_error 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "mdns 0.3.1 (git+https://github.com/icewind1991/mdns?branch=async_await)",
  "prometheus-edge-detector 0.1.0",
  "reqwest 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -663,6 +711,22 @@ name = "redox_syscall"
 version = "0.1.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "regex"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "remove_dir_all"
 version = "0.5.2"
@@ -848,6 +912,22 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "termcolor"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "time"
 version = "0.1.42"
@@ -906,6 +986,14 @@ dependencies = [
  "tokio 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "toml"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "tower-service"
 version = "0.3.0"
@@ -1110,6 +1198,14 @@ name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "winapi-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@@ -1133,9 +1229,11 @@ dependencies = [
 ]
 
 [metadata]
+"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
 "checksum anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c"
 "checksum async-stream 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "58982858be7540a465c790b95aaea6710e5139bf8956b1d1344d014fa40100b0"
 "checksum async-stream-impl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "393356ed99aa7bff0ac486dde592633b83ab02bd254d8c209d5b9f1d0f533480"
+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 "checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
@@ -1150,6 +1248,7 @@ dependencies = [
 "checksum dns-parser 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea"
 "checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
 "checksum encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28"
+"checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
 "checksum err-derive 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ead97ef6ef5530312e584d24b1ef31e96455bc2135945109fc737fe8b62ff4a5"
 "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
@@ -1165,9 +1264,11 @@ dependencies = [
 "checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
 "checksum h2 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b9433d71e471c1736fd5a61b671fc0b148d7a2992f666c958d03cd8feb3b88d1"
 "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
+"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
 "checksum http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b"
 "checksum http-body 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
 "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
+"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
 "checksum hyper 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8bf49cfb32edee45d890537d9057d1b02ed55f53b7b6a30bae83a38c9231749e"
 "checksum hyper-tls 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3adcd308402b9553630734e9c36b77a7e48b3821251ca2493e8cd596763aafaa"
 "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
@@ -1212,6 +1313,8 @@ dependencies = [
 "checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 "checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
 "checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
+"checksum regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5508c1941e4e7cb19965abef075d35a9a8b5cdf0846f30b4050e9b55dc55e87"
+"checksum regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e734e891f5b408a29efbf8309e656876276f49ab6a6ac208600b4419bd893d90"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 "checksum reqwest 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c0e798e19e258bf6c30a304622e3e9ac820e483b06a1857a026e1f109b113fe4"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
@@ -1231,11 +1334,14 @@ dependencies = [
 "checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8"
 "checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
 "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+"checksum termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
+"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 "checksum tokio 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "ffa2fdcfa937b20cb3c822a635ceecd5fc1a27a6a474527e5516aa24b8c8820a"
 "checksum tokio-macros 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "50a61f268a3db2acee8dcab514efc813dc6dbe8a00e86076f935f94304b59a7a"
 "checksum tokio-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7bde02a3a5291395f59b06ec6945a3077602fac2b07eeeaf0dee2122f3619828"
 "checksum tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930"
+"checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
 "checksum tower-service 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
 "checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 "checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
@@ -1262,6 +1368,7 @@ dependencies = [
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 "checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"

Cargo.toml

@@ -12,7 +12,9 @@ main_error = "0.1.0"
 futures-util = "0.3.1"
 reqwest = "0.10.0"
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.44"
+toml = "0.5"
+log = "0.4"
+env_logger = "0.7"
 err-derive = "0.2.1"
 
 [dev-dependencies]

config.json

@@ -1,31 +0,0 @@
-{
-  "prometheus_url": "http://astoria:9291",
-  "triggers": [
-    {
-      "trigger": {
-        "params": {
-          "instance": {
-            "type": "mdns",
-            "service": "_switch-http._tcp.local",
-            "host": "lighthouse1"
-          }
-        },
-        "query": "switch_state{instance=\"$instance\"}",
-        "from": 1,
-        "to": 0
-      },
-      "action": {
-        "method": "PUT",
-        "params": {
-          "host": {
-            "type": "mdns",
-            "service": "_switch-http._tcp.local",
-            "host": "vr_switch"
-          }
-        },
-        "url": "http://$host/off",
-        "delay": 100
-      }
-    }
-  ]
-}

config.toml

@@ -0,0 +1,17 @@
+[prometheus]
+url = "http://astoria:9291"
+
+[[trigger]]
+name = "VR Charging"
+
+[trigger.condition]
+query = "switch_state{instance=\"$instance\"}"
+from = 1
+to = 0
+params.instance = { type = "mdns", service = "_switch-http._tcp.local", host = "lighthouse1" }
+
+[trigger.action]
+method = "PUT"
+params.host = { type = "mdns", service = "_switch-http._tcp.local", host = "vr_switch" }
+url = "http://$host/off"
+delay = 300

src/config.rs

@@ -51,7 +51,7 @@ pub struct Condition {
 
 #[derive(Debug, Clone, Deserialize)]
 pub struct Action {
-    pub method: String,
+    pub method: Method,
     pub params: HashMap<String, Parameter>,
     pub url: String,
     pub delay: u64,
@@ -59,12 +59,27 @@ pub struct Action {
 
 #[derive(Debug, Clone, Deserialize)]
 pub struct Config {
-    pub prometheus_url: String,
+    pub prometheus: PrometheusConfig,
+    #[serde(rename = "trigger")]
     pub triggers: Vec<Trigger>,
 }
 
+#[derive(Debug, Clone, Deserialize)]
+pub struct PrometheusConfig {
+    pub url: String
+}
+
 #[derive(Debug, Clone, Deserialize)]
 pub struct Trigger {
-    pub trigger: Condition,
+    pub name: String,
+    pub condition: Condition,
     pub action: Action,
 }
+
+#[derive(Debug, Clone, Deserialize)]
+#[serde(rename_all = "UPPERCASE")]
+pub enum Method {
+    Get,
+    Put,
+    Post,
+}

src/main.rs

@@ -10,17 +10,19 @@ mod trigger;
 
 #[tokio::main]
 async fn main() -> Result<(), MainError> {
+    env_logger::init();
+
     if let Some(path) = std::env::args().nth(1) {
         let mut file = File::open(path).await?;
 
         let mut contents = vec![];
         file.read_to_end(&mut contents).await?;
-        let config: Config = serde_json::from_slice(&contents)?;
+        let config: Config = toml::from_slice(&contents)?;
         let trigger_manager = TriggerManager::new(config);
 
         Ok(trigger_manager.run_triggers().await?)
     } else {
-        println!("Usage {} config.json", std::env::args().next().unwrap());
+        println!("Usage {} config.toml", std::env::args().next().unwrap());
         return Ok(());
     }
 }

src/trigger.rs

@@ -1,11 +1,13 @@
 use main_error::MainError;
 use std::collections::HashMap;
-use crate::config::{Parameter, ParameterError, Trigger, Config, Action};
+use crate::config::{Parameter, ParameterError, Trigger, Config, Action, Method, Condition};
 use prometheus_edge_detector::EdgeDetector;
 use futures_util::future::try_join_all;
 use std::time::{Duration, SystemTime};
 use reqwest::Client;
 use tokio::time::delay_for;
+use log::{info, warn};
+use err_derive::Error;
 
 pub struct TriggerManager {
     http_client: Client,
@@ -21,9 +23,19 @@ fn since(time: u64) -> u64 {
     now().saturating_sub(time)
 }
 
+#[derive(Debug, Error)]
+pub enum TriggerError {
+    #[error(display = "{}", _0)]
+    Parameter(#[error(source)] ParameterError),
+    #[error(display = "{}", _0)]
+    Edge(#[error(source)] prometheus_edge_detector::Error),
+    #[error(display = "{}", _0)]
+    Network(#[error(source)] reqwest::Error),
+}
+
 impl TriggerManager {
     pub fn new(config: Config) -> TriggerManager {
-        let edge_detector = EdgeDetector::new(&config.prometheus_url);
+        let edge_detector = EdgeDetector::new(&config.prometheus.url);
 
         TriggerManager {
             http_client: Client::new(),
@@ -40,33 +52,52 @@ impl TriggerManager {
         Ok(())
     }
 
-    pub async fn run_trigger(&self, trigger: &Trigger) -> Result<(), MainError> {
+    async fn run_trigger(&self, trigger: &Trigger) -> Result<(), MainError> {
         let delay = trigger.action.delay;
         let delay_duration = Duration::from_secs(delay);
+        let error_delay = Duration::from_secs(15);
         loop {
-            let query = interpolate_params(&trigger.trigger.query, &trigger.trigger.params).await?;
+            match self.get_edge(&trigger.condition, delay).await {
-            let edge = self.edge_detector.get_last_edge(&query, trigger.trigger.from, trigger.trigger.to, Duration::from_secs(delay + 60)).await?;
+                Ok(Some(edge)) => {
-            if let Some(edge) = edge {
                     let elapsed = since(edge);
                     let wait = delay.saturating_sub(elapsed);
-                println!("Found edge, {}s ago, waiting {}s before triggering", elapsed, wait);
+                    info!("[{}] Found edge, {}s ago, waiting {}s before triggering", trigger.name, elapsed, wait);
                     let wait_delay = Duration::from_secs(wait);
                     delay_for(wait_delay).await;
 
                     // verify that the previously found edge is still the most recent
-                let new_edge = self.edge_detector.get_last_edge(&query, trigger.trigger.from, trigger.trigger.to, Duration::from_secs(delay + 60)).await?;
+                    match self.get_edge(&trigger.condition, delay).await {
-                if new_edge == Some(edge) {
+                        Ok(Some(new_edge)) if new_edge == edge => {
-                    println!("Edge still valid, triggering");
+                            info!("[{}] Edge still valid, triggering", trigger.name);
-                    run_action(&trigger.action, &self.http_client).await?;
+                            if let Err(e) = run_action(&trigger.action, &self.http_client).await {
-                    delay_for(delay_duration).await;
+                                warn!("[{}]: {}", trigger.name, e);
-                } else {
-                    println!("Edge no longer value");
                             }
-            } else {
-                println!("No edge found, waiting {}s before looking for new edge", delay);
                             delay_for(delay_duration).await;
                         }
+                        Err(e) => {
+                            warn!("[{}]: {}", trigger.name, e);
+                            delay_for(error_delay).await;
                         }
+                        _ => {
+                            info!("[{}] Edge no longer valid", trigger.name);
+                        }
+                    }
+                }
+                Ok(None) => {
+                    info!("[{}] No edge found, waiting {}s before looking for new edge", trigger.name, delay);
+                    delay_for(delay_duration).await;
+                }
+                Err(e) => {
+                    warn!("[{}]: {}", trigger.name, e);
+                    delay_for(error_delay).await;
+                }
+            }
+        }
+    }
+
+    async fn get_edge(&self, condition: &Condition, delay: u64) -> Result<Option<u64>, TriggerError> {
+        let query = interpolate_params(&condition.query, &condition.params).await?;
+        Ok(self.edge_detector.get_last_edge(&query, condition.from, condition.to, Duration::from_secs(delay + 60)).await?)
     }
 }
 
@@ -95,14 +126,14 @@ async fn test_interpolate() {
     assert_eq!("foo_bar".to_string(), result.unwrap());
 }
 
-async fn run_action(action: &Action, client: &Client) -> Result<(), MainError> {
+
+async fn run_action(action: &Action, client: &Client) -> Result<(), TriggerError> {
     let url = interpolate_params(&action.url, &action.params).await?;
 
-    let req = match action.method.to_ascii_lowercase().as_str() {
+    let req = match action.method {
-        "put" => client.put(&url),
+        Method::Put => client.put(&url),
-        "post" => client.post(&url),
+        Method::Post => client.post(&url),
-        "get" => client.get(&url),
+        Method::Get => client.get(&url),
-        _ => unimplemented!()
     };
     req.send().await?;