Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server_manager/src/core/secrets.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use anyhow::{Context, Result};
use log::info;
use serde::{Deserialize, Serialize};
use rand::RngExt;
use serde::{Deserialize, Serialize};
use std::fs;
use std::path::Path;

Expand Down
36 changes: 22 additions & 14 deletions server_manager/src/interface/web.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,24 +130,32 @@ pub async fn start_server(port: u16) -> anyhow::Result<()> {
.with_secure(false) // Localhost/LAN, http usually
.with_expiry(Expiry::OnInactivity(Duration::hours(24)));

// Initialize System once
let mut sys = System::new_all();
sys.refresh_all();

let initial_config = Config::load().unwrap_or_default();
let initial_config_mtime = std::fs::metadata("config.yaml")
// Initialize System once (non-blocking)
let sys = tokio::task::spawn_blocking(|| {
let mut s = System::new_all();
s.refresh_all();
s
})
.await?;

let initial_config = Config::load_async().await.unwrap_or_default();
let initial_config_mtime = tokio::fs::metadata("config.yaml")
.await
.ok()
.and_then(|m| m.modified().ok());

let initial_users = UserManager::load().unwrap_or_default();
let initial_users_mtime = std::fs::metadata("users.yaml")
let initial_users = UserManager::load_async().await.unwrap_or_default();
let mut initial_users_mtime = tokio::fs::metadata("users.yaml")
.await
.ok()
.and_then(|m| m.modified().ok())
.or_else(|| {
std::fs::metadata("/opt/server_manager/users.yaml")
.ok()
.and_then(|m| m.modified().ok())
});
.and_then(|m| m.modified().ok());

if initial_users_mtime.is_none() {
initial_users_mtime = tokio::fs::metadata("/opt/server_manager/users.yaml")
.await
.ok()
.and_then(|m| m.modified().ok());
}

let app_state = Arc::new(AppState {
system: Mutex::new(sys),
Expand Down