config/templates/index.html

@@ -60,23 +60,21 @@
         <p>{{ results.timestamp_str }}</p>
       </header>
       {% for group in results.groups -%}
-        <h2>{{ group.label }}</h2>
+      <h2>{{ group.label }}</h2>
-        {% for status in group.endpoints -%}
+      {% for status in group.endpoints -%}
-        <section>
+      <section>
-          <aside class="indicator {% if status.status == 0 %}ok{% elif status.status == 1 %}warn{% else %}error{% endif %}"></aside>
+        <aside class="indicator {% if status.status == 0 %}ok{% elif status.status == 1 %}warn{% else %}error{% endif %}"></aside>
-          <main>
+        <main>
-            <div class="info">
+          <div class="info">
-              <h3>{{ status.endpoint }}</h3>
+            <h3>{{ status.endpoint }}</h3>
-              <div class="spacer"></div>
+            <div class="spacer"></div>
-              {% if status.status != 2 %}<p>{{ status.rtt }}</p>{% endif %}
+            {% if status.status != 2 %}<p>{{ status.rtt }}</p>{% endif %}
-            </div>
+          </div>
-            <a href="{{ status.location }}" target="_blank">{{ status.location }}</a>
+          <a href="{{ status.location }}" target="_blank">{{ status.location }}</a>
-            {% for msg in status.errors -%}
+          {% if status.error %}<p class="error-msg">{{ status.error }}</p>{% endif %}
-            <p class="error-msg">{{ msg }}</p>
+          </main>
-            {% endfor -%}
+      </section>
-            </main>
+      {% endfor -%}
-        </section>
-        {% endfor -%}
       {% endfor -%}
 </body>
 </html>

src/handlers.rs

@@ -1,10 +1,96 @@
-use crate::State;
+use crate::{config::*, updater::update_status, State};
 use actix_web::{
     error::ErrorInternalServerError, web::Data, Error as WebError, HttpResponse,
     Result as WebResult,
 };
+use chrono::prelude::*;
+use serde::Serialize;
 use tera::{Context, Tera};
 
+#[derive(Clone, Serialize, Default, Debug)]
+pub struct EndpointStatus {
+    pub status: u8,
+    pub location: String,
+    pub endpoint: String,
+    pub rtt: Option<String>,
+    pub error: Option<String>,
+}
+
+impl EndpointStatus {
+    pub fn ok(location: String, endpoint: String, rtt: String) -> Self {
+        EndpointStatus {
+            status: 0,
+            location,
+            endpoint,
+            rtt: Some(rtt),
+            error: None,
+        }
+    }
+
+    pub fn warn(location: String, endpoint: String, rtt: String, error: Option<String>) -> Self {
+        EndpointStatus {
+            status: 1,
+            location,
+            endpoint,
+            rtt: Some(rtt),
+            error,
+        }
+    }
+
+    pub fn error(location: String, endpoint: String, error: Option<String>) -> Self {
+        EndpointStatus {
+            status: 2,
+            location,
+            endpoint,
+            rtt: None,
+            error,
+        }
+    }
+}
+
+#[derive(Serialize, Debug)]
+pub struct StatusGroup {
+    pub label: String,
+    pub endpoints: Vec<EndpointStatus>,
+}
+
+#[derive(Serialize, Debug)]
+pub struct QueryResults {
+    pub timestamp: DateTime<Utc>,
+    pub timestamp_str: String,
+    pub refresh_time: u64,
+    pub config: Config,
+    pub groups: Vec<StatusGroup>,
+}
+
+impl QueryResults {
+    pub fn new(config: Config) -> Self {
+        let time = Utc::now();
+        QueryResults {
+            timestamp: time,
+            timestamp_str: Self::format_timestamp(time),
+            refresh_time: config.refresh_time,
+            config: config.clone(),
+            groups: update_status(&config),
+        }
+    }
+
+    pub fn update(&mut self, updated_groups: Vec<StatusGroup>) {
+        self.update_timestamp();
+        self.groups = updated_groups;
+    }
+
+    fn update_timestamp(&mut self) {
+        let current_time = Utc::now();
+        self.timestamp = current_time;
+        self.timestamp_str = Self::format_timestamp(current_time);
+    }
+
+    fn format_timestamp(timestamp: DateTime<Utc>) -> String {
+        timestamp.format("%Y-%m-%d %H:%M:%S").to_string()
+    }
+}
+
 pub fn index(tmpl: Data<Tera>, state: Data<State>) -> WebResult<HttpResponse, WebError> {
     let state = state.read().unwrap();
     let mut ctx = Context::new();

src/main.rs

@@ -15,9 +15,8 @@ extern crate ring;
 mod config;
 mod handlers;
 mod updater;
-mod results;
 
-use self::{config::*, handlers::*, updater::*, results::QueryResults};
+use self::{config::*, handlers::*, updater::*};
 use actix::System;
 use actix_web::{middleware::Logger, web::resource, App, HttpServer};
 use ron::de::from_str;

src/results.rs

@@ -1,87 +0,0 @@
-use crate::{config::*, updater::update_status};
-use chrono::prelude::*;
-use serde::Serialize;
-
-#[derive(Clone, Serialize, Default, Debug)]
-pub struct EndpointStatus {
-    pub status: u8,
-    pub location: String,
-    pub endpoint: String,
-    pub rtt: Option<String>,
-    pub errors: Vec<String>,
-}
-
-impl EndpointStatus {
-    pub fn ok(location: String, endpoint: String, rtt: String) -> Self {
-        EndpointStatus {
-            status: 0,
-            location,
-            endpoint,
-            rtt: Some(rtt),
-            errors: vec![],
-        }
-    }
-
-    pub fn warn(location: String, endpoint: String, rtt: String, errors: Vec<String>) -> Self {
-        EndpointStatus {
-            status: 1,
-            location,
-            endpoint,
-            rtt: Some(rtt),
-            errors,
-        }
-    }
-
-    pub fn error(location: String, endpoint: String, errors: Vec<String>) -> Self {
-        EndpointStatus {
-            status: 2,
-            location,
-            endpoint,
-            rtt: None,
-            errors,
-        }
-    }
-}
-
-#[derive(Serialize, Debug)]
-pub struct StatusGroup {
-    pub label: String,
-    pub endpoints: Vec<EndpointStatus>,
-}
-
-#[derive(Serialize, Debug)]
-pub struct QueryResults {
-    pub timestamp: DateTime<Utc>,
-    pub timestamp_str: String,
-    pub refresh_time: u64,
-    pub config: Config,
-    pub groups: Vec<StatusGroup>,
-}
-
-impl QueryResults {
-    pub fn new(config: Config) -> Self {
-        let time = Utc::now();
-        QueryResults {
-            timestamp: time,
-            timestamp_str: Self::format_timestamp(time),
-            refresh_time: config.refresh_time,
-            config: config.clone(),
-            groups: update_status(&config),
-        }
-    }
-
-    pub fn update(&mut self, updated_groups: Vec<StatusGroup>) {
-        self.update_timestamp();
-        self.groups = updated_groups;
-    }
-
-    fn update_timestamp(&mut self) {
-        let current_time = Utc::now();
-        self.timestamp = current_time;
-        self.timestamp_str = Self::format_timestamp(current_time);
-    }
-
-    fn format_timestamp(timestamp: DateTime<Utc>) -> String {
-        timestamp.format("%Y-%m-%d %H:%M:%S").to_string()
-    }
-}

src/updater.rs

@@ -1,6 +1,6 @@
 use crate::{
     config::*,
-    results::{EndpointStatus, StatusGroup},
+    handlers::{EndpointStatus, StatusGroup},
     State,
 };
 use chrono::Utc;
@@ -62,42 +62,43 @@ fn get_result(
     match ping_result {
         Ok(mut res) => {
             let res_body = res.text().expect("could not get body of request");
-            let mut errors = vec![];
+            let mut error = None;
 
             if res.status() != code {
-                errors.push(format!(
+                error = append_err_msg(
-                    "Status code mismatch: {} != {}",
+                    error,
-                    res.status().as_u16(),
+                    format!(
-                    code
+                        "Status code mismatch: {} != {}",
-                ));
+                        res.status().as_u16(),
+                        code
+                    ),
+                );
             }
 
             if let Some(expected_hash) = &endpoint.body_hash {
                 let expected = from_hex(expected_hash).unwrap();
                 let actual = digest(&SHA256, String::from(res_body).as_bytes());
                 if &expected != &actual.as_ref() {
-                    errors.push(String::from("Body hash mismatch."));
+                    error = append_err_msg(error, String::from("Body hash mismatch."));
                 }
             } else if !body.is_empty() && res_body != body {
-                errors.push(format!(
+                error = append_err_msg(
-                    "Body mismatch: {} != {}",
+                    error,
-                    res_body.len(),
+                    format!("Body mismatch: {} != {}", res_body.len(), body.len()),
-                    body.len()
+                );
-                ));
             }
 
             if let Some(max_rtt) = endpoint.max_rtt {
                 if rtt.num_milliseconds() > max_rtt {
-                    errors.push(format!(
+                    error = append_err_msg(
-                        "RTT too long: {} > {}s",
+                        error,
-                        rtt_string,
+                        format!("RTT too long: {} > {}s", rtt_string, max_rtt as f64 / 1000.),
-                        max_rtt as f64 / 1000.
+                    );
-                    ));
                 }
             }
 
-            if !errors.is_empty() {
+            if error.is_some() {
-                EndpointStatus::warn(url, label, rtt_string, errors)
+                EndpointStatus::warn(url, label, rtt_string, error)
             } else {
                 EndpointStatus::ok(url, label, rtt_string)
             }
@@ -106,7 +107,7 @@ fn get_result(
             if let Some(true) = endpoint.should_err {
                 EndpointStatus::ok(url, label, rtt_string)
             } else {
-                EndpointStatus::error(url, label, vec![format!("{}", e)])
+                EndpointStatus::error(url, label, Some(format!("{}", e)))
             }
         }
     }
@@ -123,3 +124,10 @@ fn get_url(base: &Option<String>, path: &String, port: Option<u16>) -> Result<St
     }
     Ok(url.into_string())
 }
+
+fn append_err_msg(optional: Option<String>, to_append: String) -> Option<String> {
+    Some(match optional {
+        Some(e) => format!("{}\n{}", e, to_append),
+        None => to_append,
+    })
+}