1
Fork 0

Do proper async parallelism

This commit is contained in:
Jake Howard 2023-09-03 15:33:03 +01:00
parent f1a54d7784
commit 9f6d2d7b3b
Signed by: jake
GPG Key ID: 57AFB45680EDD477
1 changed files with 33 additions and 17 deletions

View File

@ -6,6 +6,7 @@ use axum::{routing::get, Router};
use serde::Serialize;
use std::collections::HashSet;
use std::net::{IpAddr, Ipv6Addr, SocketAddr};
use tokio::task::JoinSet;
#[derive(Clone)]
struct AppState {
@ -18,6 +19,27 @@ struct DokkuApp {
hosts: HashSet<String>,
}
impl DokkuApp {
async fn try_from_path(path: PathBuf) -> Option<Self> {
let vhost_path = path.join("VHOST");
if !vhost_path.is_file().await {
return None;
}
let current_vhosts = read_to_string(&vhost_path).await.unwrap();
if current_vhosts.is_empty() {
return None;
}
Some(DokkuApp {
name: String::from(path.file_name().unwrap().to_str().unwrap()),
hosts: current_vhosts.lines().map(String::from).collect(),
})
}
}
fn get_dokku_root() -> Option<std::path::PathBuf> {
// First, check if we have a custom directory
if let Some(dokku_root) = std::env::var_os("DOKKU_ROOT") {
@ -48,28 +70,22 @@ fn get_dokku_root() -> Option<std::path::PathBuf> {
async fn hosts(State(state): State<AppState>) -> axum::Json<Vec<DokkuApp>> {
let mut dir_entries = state.dokku_root.read_dir().await.unwrap();
let mut apps: Vec<DokkuApp> = Vec::new();
let mut join_set = JoinSet::new();
while let Some(Ok(dir_entry)) = dir_entries.next().await {
let path = dir_entry.path();
let vhost_path = path.join("VHOST");
if !vhost_path.is_file().await {
continue;
}
let current_vhosts = read_to_string(&vhost_path).await.unwrap();
if current_vhosts.is_empty() {
continue;
}
apps.push(DokkuApp {
name: String::from(path.file_name().unwrap().to_str().unwrap()),
hosts: current_vhosts.lines().map(String::from).collect(),
});
join_set.spawn(DokkuApp::try_from_path(path));
}
let mut apps: Vec<DokkuApp> = Vec::new();
while let Some(res) = join_set.join_next().await {
if let Some(app) = res.unwrap() {
apps.push(app)
}
}
axum::Json(apps)
}