general ui work
This commit is contained in:
parent
cb9e094582
commit
9a9d87038a
GPG key ID:
F350507060ED6C90
2 changed files with 110 additions and 51 deletions
100
src/main.rs
100
src/main.rs
|
|
@ -71,9 +71,10 @@ fn index(tmpl: Data<Tera>, state: Data<StatusState>) -> WebResult<HttpResponse,
|
|||
let state = update_state(state.lock().unwrap());
|
||||
let mut ctx = Context::new();
|
||||
ctx.insert("results", &*state);
|
||||
let s = tmpl
|
||||
.render("index.html", &tera::Context::new())
|
||||
.map_err(|_| ErrorInternalServerError("Template error"))?;
|
||||
let s = tmpl.render("index.html", &ctx).map_err(|e| {
|
||||
println!("{:?}", e);
|
||||
ErrorInternalServerError("Template error")
|
||||
})?;
|
||||
Ok(HttpResponse::Ok().content_type("text/html").body(s))
|
||||
}
|
||||
|
||||
|
|
@ -125,49 +126,68 @@ fn update_status(config: &Config) -> Vec<Status> {
|
|||
|
||||
for website_conf in &config.websites {
|
||||
for endpoint in &website_conf.endpoints {
|
||||
let (label, path, port, code, body) = get_endpoint_info(endpoint.clone());
|
||||
let url = get_url(&website_conf.base, &path, port).expect("reading config");
|
||||
if let Ok(mut res) = client.get(&url).send() {
|
||||
let res_body = res.text().expect("could not get body of request");
|
||||
let does_code_match = res.status() == code;
|
||||
let does_body_match = body.is_empty() || res_body == body;
|
||||
|
||||
results.push(if !does_code_match {
|
||||
Status {
|
||||
status: 1,
|
||||
location: url,
|
||||
domain: website_conf.label.clone(),
|
||||
endpoint: label,
|
||||
error: Some(format!(
|
||||
"Status code mismatch! {} != {}",
|
||||
res.status().as_u16(),
|
||||
code
|
||||
)),
|
||||
}
|
||||
} else if !does_body_match {
|
||||
Status {
|
||||
status: 2,
|
||||
location: url,
|
||||
domain: website_conf.label.clone(),
|
||||
endpoint: label,
|
||||
error: Some(format!("Body mismatch! {} != {}", res_body, body)),
|
||||
}
|
||||
} else {
|
||||
Status {
|
||||
status: 0,
|
||||
location: url,
|
||||
domain: website_conf.label.clone(),
|
||||
endpoint: label,
|
||||
error: None,
|
||||
}
|
||||
});
|
||||
}
|
||||
results.push(get_result(website_conf, &client, endpoint));
|
||||
}
|
||||
}
|
||||
|
||||
results
|
||||
}
|
||||
|
||||
fn get_result(website_conf: &WebsiteConf, client: &Client, endpoint: &EndpointConf) -> Status {
|
||||
let (label, path, port, code, body) = get_endpoint_info(endpoint.clone());
|
||||
let url = get_url(&website_conf.base, &path, port).expect("reading config");
|
||||
let ping_result = client.get(&url).send();
|
||||
|
||||
match ping_result {
|
||||
Ok(mut res) => {
|
||||
let res_body = res.text().expect("could not get body of request");
|
||||
let does_code_match = res.status() == code;
|
||||
let does_body_match = body.is_empty() || res_body == body;
|
||||
|
||||
if !does_code_match {
|
||||
Status {
|
||||
status: 1,
|
||||
location: url,
|
||||
domain: website_conf.label.clone(),
|
||||
endpoint: label,
|
||||
error: Some(format!(
|
||||
"Status code mismatch! {} != {}",
|
||||
res.status().as_u16(),
|
||||
code
|
||||
)),
|
||||
}
|
||||
} else if !does_body_match {
|
||||
Status {
|
||||
status: 1,
|
||||
location: url,
|
||||
domain: website_conf.label.clone(),
|
||||
endpoint: label,
|
||||
error: Some(format!(
|
||||
"Body mismatch! {} != {}",
|
||||
res_body.len(),
|
||||
body.len()
|
||||
)),
|
||||
}
|
||||
} else {
|
||||
Status {
|
||||
status: 0,
|
||||
location: url,
|
||||
domain: website_conf.label.clone(),
|
||||
endpoint: label,
|
||||
error: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(e) => Status {
|
||||
status: 2,
|
||||
location: url,
|
||||
domain: website_conf.label.clone(),
|
||||
endpoint: label,
|
||||
error: Some(format!("{}", e)),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
fn get_url(base: &String, path: &String, port: Option<u16>) -> Result<String, UrlError> {
|
||||
let mut url = Url::parse(base)?.join(path)?;
|
||||
if let Err(e) = url.set_port(port) {
|
||||
|
|
|
|||
|
|
@ -1,18 +1,57 @@
|
|||
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<title>Actix web</title>
|
||||
<meta charset="utf-8"/>
|
||||
<title>Endstat</title>
|
||||
<style>
|
||||
body {
|
||||
background-color: #212121;
|
||||
margin: 0;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
main {
|
||||
width: 700px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
section {
|
||||
display: flex;
|
||||
background-color: #424242;
|
||||
align-items: center;
|
||||
margin: 1rem;
|
||||
padding: 1rem;
|
||||
border-radius: 1rem;
|
||||
}
|
||||
|
||||
p { margin: 0; }
|
||||
|
||||
h1 { display: inline; }
|
||||
|
||||
.indicator {
|
||||
width: 1rem;
|
||||
height: 1rem;
|
||||
border-radius: 1rem;
|
||||
}
|
||||
.ok { background-color: green; }
|
||||
.warn { background-color: yellow; }
|
||||
.error { background-color: red; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<h1>Welcome!</h1>
|
||||
<p>
|
||||
<h3>What is your name?</h3>
|
||||
<form>
|
||||
<input type="text" name="name" /><br/>
|
||||
<p><input type="submit"></p>
|
||||
</form>
|
||||
</p>
|
||||
<main>
|
||||
<h1>Welcome!</h1>
|
||||
{% for status in results.statuses -%}
|
||||
<section>
|
||||
<p>{{ status.domain }}</p>
|
||||
<p>{{ status.endpoint }}</p>
|
||||
<p>{{ status.location }}</p>
|
||||
{% if status.error %}<p>{{ status.error }}</p>{% endif %}
|
||||
<div class="indicator {% if status.status == 0 %}ok{% elif status.status == 1 %}warn{% else %}error{% endif %}"></div>
|
||||
|
||||
</section>
|
||||
{% endfor -%}
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Reference in a new issue