diff --git a/noxis-rs/src/options/preboot.rs b/noxis-rs/src/options/preboot.rs index cf3e55d..d5162d5 100644 --- a/noxis-rs/src/options/preboot.rs +++ b/noxis-rs/src/options/preboot.rs @@ -3,6 +3,7 @@ use anyhow::{Result, Ok, Error}; use clap::Parser; use std::path::PathBuf; +use std::env::{var, vars}; const SOCKET_PATH: &str = "/var/run/enode/hostagent.sock"; @@ -38,13 +39,7 @@ impl std::fmt::Display for EnvVars { } } -// impl<'a> Default for EnvVars { -// fn default() -> &'a str { -// todo!() -// // setting default env vars values if not exists -// } -// } - +/// impl<'a> EnvVars { // Default trait func is not satisfying this issue fn default(self) -> &'a str { @@ -58,14 +53,38 @@ impl<'a> EnvVars { EnvVars::NoxisLogTo => "./", EnvVars::NoxisRemoteServerUrl => "localhost", EnvVars::NoxisConfig => "./settings.json", - EnvVars::NoxisMetrics => "NOXIS_METRICS", + EnvVars::NoxisMetrics => "full", } } - fn setup() { + fn process_env_var(self, preboot_value: &str) { + // let default = self.default(); + match var(self.to_string()) { + std::result::Result::Ok(val) => { + if val != preboot_value { + std::env::set_var(self.to_string(), self.default()); + } + }, + Err(_) => { + std::env::set_var(self.to_string(), preboot_value); + println!("{:?}", vars()); + }, + } + } + pub fn setup(preboot: &PrebootParams) { // setup default if not exists - // check values and save preboot states in env vars if not equal - todo!() + + Self::NoxisNoHagent.process_env_var(&preboot.no_hostagent.to_string()); + Self::NoxisNoLogs.process_env_var(&preboot.no_logs.to_string()); + Self::NoxisRefreshLogs.process_env_var(&preboot.refresh_logs.to_string()); + Self::NoxisNoRemoteConfig.process_env_var(&preboot.no_remote_config.to_string()); + Self::NoxisNoConfigSub.process_env_var(&preboot.no_sub.to_string()); + Self::NoxisSocketPath.process_env_var(preboot.socket_path.to_str().unwrap()); + Self::NoxisLogTo.process_env_var(preboot.log_to.to_str().unwrap()); + Self::NoxisRemoteServerUrl.process_env_var(&preboot.remote_server_url); + Self::NoxisConfig.process_env_var(preboot.config.to_str().unwrap()); + Self::NoxisMetrics.process_env_var(&preboot.metrics.to_string()); + } } @@ -282,6 +301,7 @@ impl PrebootParams { // return Err(Error::msg("Local Config Not Found or Noxis can't read it. Cannot start")); } // redis server check + EnvVars::setup(&self); Ok(self) } }