simono41/prometheus_wireguard_exporter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simpified code

Browse source
This commit is contained in:
Francesco Cogno 2019-05-20 09:45:20 +02:00
parent 5b983d5e34
commit be9bf63fac
No known key found for this signature in database
GPG key ID: 20883E192428EA7A
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main.rs
View file

@ -21,6 +21,7 @@ use std::process::Command;
use std::string::String; use std::string::String;
use wireguard::WireGuard; use wireguard::WireGuard;
mod wireguard_config; mod wireguard_config;
use wireguard_config::PeerEntryHashMap;
fn check_compliance(req: &Request<Body>) -> Result<(), Response<Body>> { fn check_compliance(req: &Request<Body>) -> Result<(), Response<Body>> {
if req.uri() != "/metrics" { if req.uri() != "/metrics" {
@ -61,6 +62,18 @@ fn handle_request(
}) })
} }
fn wg_with_text(
wg_config_str: &str,
wg_output: ::std::process::Output,
) -> Result<Response<Body>, ExporterError> {
let pehm = PeerEntryHashMap::try_from(wg_config_str)?;
println!("pehm == {:?}", pehm);
let wg_output_string = String::from_utf8(wg_output.stdout)?;
let wg = WireGuard::try_from(&wg_output_string as &str)?;
Ok(Response::new(Body::from(wg.render())))
}
fn perform_request( fn perform_request(
_req: Request<Body>, _req: Request<Body>,
options: &Options, options: &Options,
@ -81,14 +94,9 @@ fn perform_request(
.and_then(|output| { .and_then(|output| {
if let Some(extract_names_config_file) = options.extract_names_config_file { if let Some(extract_names_config_file) = options.extract_names_config_file {
Either::A( Either::A(
done(String::from_utf8(output.stdout)) done(::std::fs::read_to_string(extract_names_config_file))
.from_err() .from_err()
.and_then(|output_str| { .and_then(|wg_config_string| wg_with_text(&wg_config_string as &str, output)),
trace!("{}", output_str);
done(WireGuard::try_from(&output_str as &str))
.from_err()
.and_then(|wg| ok(Response::new(Body::from(wg.render()))))
}),
) )
} else { } else {
Either::B( Either::B(