zaphar/durnitisp
1
0
Fork 0
mirror of https://github.com/zaphar/durnitisp.git synced 2025-07-22 18:19:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Some more ergonomics

Browse Source
This commit is contained in:
Jeremy Wall 2020-07-31 15:06:27 -04:00
parent e9d4a770d3
commit 6fdce7e8d2
1 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/main.rs
View File

@ -123,7 +123,12 @@ fn main() -> anyhow::Result<()> {
gflags::print_help_and_exit(0); gflags::print_help_and_exit(0);
} }
let level = if DEBUG.flag { 3 } else { 2 }; let level = if DEBUG.flag || cfg!(debug_assertions) {
3
} else {
2
};
stderrlog::new() stderrlog::new()
.verbosity(level) .verbosity(level)
.timestamp(stderrlog::Timestamp::Millisecond) .timestamp(stderrlog::Timestamp::Millisecond)
@ -154,8 +159,49 @@ fn main() -> anyhow::Result<()> {
let socket_addrs = resolve_addrs(&stun_servers).unwrap(); let socket_addrs = resolve_addrs(&stun_servers).unwrap();
let stun_servers = Arc::new(stun_servers); let stun_servers = Arc::new(stun_servers);
// first we attempt connections to each server.
let mut parent = Nursery::new(); let mut parent = Nursery::new();
// First we start the render thread.
{
// Introduce a new scope for our Arc to clone before moving it into the thread.
let stop_signal = stop_signal.clone();
// thread::Handle starts the thread immediately so the render thread will usually start first.
let render_thread = thread::Handle::new(move || {
debug!("attempting to start server on {}", LISTENHOST.flag);
let server = match tiny_http::Server::http(LISTENHOST.flag) {
Ok(server) => server,
Err(err) => {
let mut signal = stop_signal.write().unwrap();
*signal = true;
error!("Error starting render thread {}", err);
error!("Shutting down all threads...");
std::process::exit(1);
}
};
info!("Listening for metrics request on {}", LISTENHOST.flag);
loop {
info!("Waiting for request");
match server.recv() {
Ok(req) => {
let mut buffer = vec![];
// Gather the metrics.
let encoder = TextEncoder::new();
let metric_families = r.gather();
encoder.encode(&metric_families, &mut buffer).unwrap();
let response = tiny_http::Response::from_data(buffer).with_status_code(200);
if let Err(e) = req.respond(response) {
error!("Error responding to request {}", e);
}
}
Err(e) => {
info!("Invalid http request! {}", e);
}
}
}
});
parent.adopt(Box::new(render_thread));
}
// Then we attempt connections to each server.
for (i, s) in socket_addrs.iter().enumerate() { for (i, s) in socket_addrs.iter().enumerate() {
let stun_servers_copy = stun_servers.clone(); let stun_servers_copy = stun_servers.clone();
let stun_counter_vec_copy = stun_counter_vec.clone(); let stun_counter_vec_copy = stun_counter_vec.clone();
@ -216,41 +262,6 @@ fn main() -> anyhow::Result<()> {
}); });
parent.schedule(Box::new(connect_thread)); parent.schedule(Box::new(connect_thread));
} }
let stop_signal = stop_signal.clone();
let render_thread = thread::Pending::new(move || {
debug!("attempting to start server on {}", LISTENHOST.flag);
let server = match tiny_http::Server::http(LISTENHOST.flag) {
Ok(server) => server,
Err(err) => {
let mut signal = stop_signal.write().unwrap();
*signal = true;
error!("Error starting render thread {}", err);
error!("Shutting down all threads...");
return;
}
};
loop {
info!("Waiting for request");
match server.recv() {
Ok(req) => {
let mut buffer = vec![];
// Gather the metrics.
let encoder = TextEncoder::new();
let metric_families = r.gather();
encoder.encode(&metric_families, &mut buffer).unwrap();
let response = tiny_http::Response::from_data(buffer).with_status_code(200);
if let Err(e) = req.respond(response) {
info!("Error responding to request {}", e);
}
}
Err(e) => {
info!("Invalid http request! {}", e);
}
}
}
});
parent.schedule(Box::new(render_thread));
// Blocks forever // Blocks forever
parent.wait(); parent.wait();
Ok(()) Ok(())