From 529247a839e3a5094757318a27cbec9f892e86f2 Mon Sep 17 00:00:00 2001 From: prplV Date: Mon, 12 May 2025 17:59:00 +0300 Subject: [PATCH] config changed + using preboot remote server --- noxis-rs/settings.json | 1 - noxis-rs/src/options/config.rs | 6 +----- noxis-rs/src/options/structs.rs | 3 --- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/noxis-rs/settings.json b/noxis-rs/settings.json index 496fe2a..b27d9c7 100644 --- a/noxis-rs/settings.json +++ b/noxis-rs/settings.json @@ -1,6 +1,5 @@ { "dateOfCreation": "1721381809112", - "configServer": "192.168.2.37", "processes": [ { "name": "temp-process", diff --git a/noxis-rs/src/options/config.rs b/noxis-rs/src/options/config.rs index 9e21042..00e3e73 100644 --- a/noxis-rs/src/options/config.rs +++ b/noxis-rs/src/options/config.rs @@ -177,7 +177,7 @@ pub mod v2 { }; } }; - match get_redis_connection(&local_config.config_server).await { + match get_redis_connection(¶ms.remote_server_url).await { Some(mut conn) => { let mut pub_sub = conn.as_pubsub(); let channel_name = get_container_id().unwrap_or(String::from("default")); @@ -879,13 +879,11 @@ mod config_unittests { // old one (kinda local) let a = Processes { date_of_creation: String::from("1"), - config_server: String::new(), processes: vec![], }; // new one (kinda remote) let b = Processes { date_of_creation: String::from("2"), - config_server: String::new(), processes: vec![], }; @@ -900,7 +898,6 @@ mod config_unittests { fn save_config() { let a = Processes { date_of_creation: String::from("1"), - config_server: String::new(), processes: vec![], }; assert!(save_new_config(&a, "tests/examples/save-conf.json").is_ok()); @@ -910,7 +907,6 @@ mod config_unittests { fn save_to_zero_file() { let a = Processes { date_of_creation: String::from("1"), - config_server: String::new(), processes: vec![], }; assert!(save_new_config(&a, "tests/examples/none.json").is_ok()); diff --git a/noxis-rs/src/options/structs.rs b/noxis-rs/src/options/structs.rs index 56be896..d37011d 100644 --- a/noxis-rs/src/options/structs.rs +++ b/noxis-rs/src/options/structs.rs @@ -141,8 +141,6 @@ pub struct Processes { // runner_id: usize, #[serde(rename = "dateOfCreation")] pub date_of_creation: String, - #[serde(rename = "configServer")] - pub config_server: String, #[serde(default)] pub processes: Vec, } @@ -151,7 +149,6 @@ impl Default for Processes { fn default() -> Self { Self { date_of_creation : String::new(), - config_server : String::from("default"), processes : Vec::new(), } }