settings devided into server and app

This commit is contained in:
2025-08-29 19:25:31 +02:00
parent 32a4435be1
commit 05afe84ffb
3 changed files with 30 additions and 24 deletions

View File

@@ -1,25 +1,35 @@
use config::Config;
use config::{Config, Environment, File};
use serde::Deserialize;
use crate::models::WatcherConfig;
#[derive(Debug, Deserialize, Clone)]
pub struct Settings {
pub server: ServerSettings,
pub app: AppSettings,
}
#[derive(Debug, Deserialize, Clone)]
pub struct AppConfig {
pub watcher: WatcherConfig,
pub struct AppSettings {
pub heartbeat_interval_secs: u64,
pub metrics_interval_secs: u64,
pub port: u16,
}
impl AppConfig {
pub fn from_env() -> Result<Self, config::ConfigError> {
// Load .env file (works in both Docker and local development)
println!("Loading .env file...");
#[derive(Debug, Deserialize, Clone)]
pub struct ServerSettings {
pub url: String,
}
impl Settings {
pub fn new() -> Result<Self, config::ConfigError> {
// Load .env file first
dotenvy::dotenv().ok();
let cfg = Config::builder()
.add_source(config::Environment::with_prefix("WATCHER").separator("__"))
.build()?;
// Merge settings from multiple sources
let builder = config::Config::builder()
.add_source(config::File::with_name("Settings").required(false)) // Settings.toml optional
.add_source(Environment::default().separator("_"));
println!("Configuration loaded: {cfg:#?}");
cfg.try_deserialize()
builder.build()?.try_deserialize()
}
}

View File

@@ -7,7 +7,7 @@ pub mod hardware;
pub mod metrics;
pub mod models;
use crate::config::AppConfig;
use crate::config::Settings;
use std::error::Error;
use std::marker::Send;
@@ -27,8 +27,11 @@ async fn flatten<T>(
#[tokio::main]
async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
let config = AppConfig::from_env().expect("Failed to load configuration");
let server_url = config.watcher.server_url.clone();
let settings = Settings::new().expect("Failed to load configuration");
// Explicit variables for each .env / config field
let _app_port = settings.app.port;
let server_url = settings.server.url;
// Registration
let (server_id, ip) = match api::register_with_server(&server_url).await {

View File

@@ -72,10 +72,3 @@ pub struct HardwareDto {
pub ram_size: f64,
pub ip_address: String,
}
#[derive(Debug, Deserialize, Clone)]
pub struct WatcherConfig {
pub server_url: String,
pub heartbeat_interval_secs: u64,
pub metrics_interval_secs: u64,
}