From 9b0dfa63053193a863b4a159da0730860c5e1bb1 Mon Sep 17 00:00:00 2001 From: Macpie Date: Mon, 13 May 2024 10:46:20 -0700 Subject: [PATCH] Add default settings --- boost_manager/src/settings.rs | 1 + custom_tracing/src/settings.rs | 8 ++++++++ ingest/src/settings.rs | 1 + iot_config/src/settings.rs | 1 + iot_packet_verifier/src/settings.rs | 1 + iot_verifier/src/settings.rs | 1 + mobile_config/src/settings.rs | 1 + mobile_packet_verifier/src/settings.rs | 1 + mobile_verifier/src/settings.rs | 1 + poc_entropy/src/settings.rs | 1 + price/src/settings.rs | 1 + reward_index/src/settings.rs | 1 + 12 files changed, 19 insertions(+) diff --git a/boost_manager/src/settings.rs b/boost_manager/src/settings.rs index 40ffabfa5..e83ae58d3 100644 --- a/boost_manager/src/settings.rs +++ b/boost_manager/src/settings.rs @@ -9,6 +9,7 @@ pub struct Settings { /// "poc_entropy=debug,poc_store=info" #[serde(default = "default_log")] pub log: String, + #[serde(default = "custom_tracing::Settings::serde_default")] pub custom_tracing: custom_tracing::Settings, /// Cache location for generated verified reports pub cache: String, diff --git a/custom_tracing/src/settings.rs b/custom_tracing/src/settings.rs index d00be59dc..b3962363d 100644 --- a/custom_tracing/src/settings.rs +++ b/custom_tracing/src/settings.rs @@ -10,3 +10,11 @@ pub struct Settings { pub fn default_tracing_cfg_file() -> String { "tracing.cfg".to_string() } + +impl Settings { + pub fn serde_default() -> Self { + Self { + tracing_cfg_file: default_tracing_cfg_file(), + } + } +} diff --git a/ingest/src/settings.rs b/ingest/src/settings.rs index 7b55185ab..a37901806 100644 --- a/ingest/src/settings.rs +++ b/ingest/src/settings.rs @@ -13,6 +13,7 @@ pub struct Settings { /// "ingest=debug,poc_store=info" #[serde(default = "default_log")] pub log: String, + #[serde(default = "custom_tracing::Settings::serde_default")] pub custom_tracing: custom_tracing::Settings, /// Mode to run the server in (iot or mobile). Required pub mode: Mode, diff --git a/iot_config/src/settings.rs b/iot_config/src/settings.rs index 56be9b09a..1e58a7f4b 100644 --- a/iot_config/src/settings.rs +++ b/iot_config/src/settings.rs @@ -13,6 +13,7 @@ pub struct Settings { /// "iot_config=info" #[serde(default = "default_log")] pub log: String, + #[serde(default = "custom_tracing::Settings::serde_default")] pub custom_tracing: custom_tracing::Settings, /// Listen address. Required. Default is 0.0.0.0:8080 #[serde(default = "default_listen_addr")] diff --git a/iot_packet_verifier/src/settings.rs b/iot_packet_verifier/src/settings.rs index 321d1806c..e69732040 100644 --- a/iot_packet_verifier/src/settings.rs +++ b/iot_packet_verifier/src/settings.rs @@ -9,6 +9,7 @@ pub struct Settings { /// "iot_packet_verifier=debug,poc_store=info" #[serde(default = "default_log")] pub log: String, + #[serde(default = "custom_tracing::Settings::serde_default")] pub custom_tracing: custom_tracing::Settings, /// Cache location for generated verified reports pub cache: String, diff --git a/iot_verifier/src/settings.rs b/iot_verifier/src/settings.rs index e8a1e6327..e6c2e89e3 100644 --- a/iot_verifier/src/settings.rs +++ b/iot_verifier/src/settings.rs @@ -11,6 +11,7 @@ pub struct Settings { /// "iot_verifier=debug,poc_store=info" #[serde(default = "default_log")] pub log: String, + #[serde(default = "custom_tracing::Settings::serde_default")] pub custom_tracing: custom_tracing::Settings, /// Cache location for generated verified reports pub cache: String, diff --git a/mobile_config/src/settings.rs b/mobile_config/src/settings.rs index 451d5f1d7..b8c67fa6d 100644 --- a/mobile_config/src/settings.rs +++ b/mobile_config/src/settings.rs @@ -13,6 +13,7 @@ pub struct Settings { /// "mobile_config=info" #[serde(default = "default_log")] pub log: String, + #[serde(default = "custom_tracing::Settings::serde_default")] pub custom_tracing: custom_tracing::Settings, /// Listen address. Required. Default to 0.0.0.0::8080 #[serde(default = "default_listen_addr")] diff --git a/mobile_packet_verifier/src/settings.rs b/mobile_packet_verifier/src/settings.rs index 7f4f826dd..595283f3c 100644 --- a/mobile_packet_verifier/src/settings.rs +++ b/mobile_packet_verifier/src/settings.rs @@ -9,6 +9,7 @@ pub struct Settings { /// "mobile_verifier=debug,poc_store=info" #[serde(default = "default_log")] pub log: String, + #[serde(default = "custom_tracing::Settings::serde_default")] pub custom_tracing: custom_tracing::Settings, /// Cache location for generated verified reports pub cache: String, diff --git a/mobile_verifier/src/settings.rs b/mobile_verifier/src/settings.rs index d1ea819d7..c23b162f8 100644 --- a/mobile_verifier/src/settings.rs +++ b/mobile_verifier/src/settings.rs @@ -9,6 +9,7 @@ pub struct Settings { /// "mobile_verifier=debug,poc_store=info" #[serde(default = "default_log")] pub log: String, + #[serde(default = "custom_tracing::Settings::serde_default")] pub custom_tracing: custom_tracing::Settings, /// Cache location for generated verified reports pub cache: String, diff --git a/poc_entropy/src/settings.rs b/poc_entropy/src/settings.rs index 4967c5847..d8deb40e2 100644 --- a/poc_entropy/src/settings.rs +++ b/poc_entropy/src/settings.rs @@ -8,6 +8,7 @@ pub struct Settings { /// "poc_entropy=debug,poc_store=info" #[serde(default = "default_log")] pub log: String, + #[serde(default = "custom_tracing::Settings::serde_default")] pub custom_tracing: custom_tracing::Settings, /// Listen address for http requests for entropy. Default "0.0.0.0:8080" #[serde(default = "default_listen_addr")] diff --git a/price/src/settings.rs b/price/src/settings.rs index 4396fe49d..bb0e8d1e7 100644 --- a/price/src/settings.rs +++ b/price/src/settings.rs @@ -37,6 +37,7 @@ pub struct Settings { /// "price=debug" #[serde(default = "default_log")] pub log: String, + #[serde(default = "custom_tracing::Settings::serde_default")] pub custom_tracing: custom_tracing::Settings, /// Source URL for price data. Required #[serde(default = "default_source")] diff --git a/reward_index/src/settings.rs b/reward_index/src/settings.rs index 99fba9976..c7e6f80e5 100644 --- a/reward_index/src/settings.rs +++ b/reward_index/src/settings.rs @@ -27,6 +27,7 @@ pub struct Settings { /// "poc_entropy=debug,poc_store=info" #[serde(default = "default_log")] pub log: String, + #[serde(default = "custom_tracing::Settings::serde_default")] pub custom_tracing: custom_tracing::Settings, /// Check interval in seconds. (Default is 900; 15 minutes) #[serde(default = "default_interval")]