diff --git a/src/concepts/config.rs b/src/concepts/config.rs index 415dcac..7173c12 100644 --- a/src/concepts/config.rs +++ b/src/concepts/config.rs @@ -19,22 +19,21 @@ pub type Patterns = BTreeMap>; #[cfg_attr(test, derive(Default))] #[serde(deny_unknown_fields)] pub struct Config { - #[serde(default)] - patterns: Patterns, - - #[serde(default)] - streams: BTreeMap, - #[serde(default = "num_cpus::get")] concurrency: usize, + #[serde(default = "dot", skip_serializing_if = "String::is_empty")] + state_directory: String, + + #[serde(default)] + patterns: Patterns, #[serde(default, skip_serializing_if = "Vec::is_empty")] start: Vec>, #[serde(default, skip_serializing_if = "Vec::is_empty")] stop: Vec>, - #[serde(default = "dot", skip_serializing_if = "String::is_empty")] - state_directory: String, + #[serde(default)] + streams: BTreeMap, // This field only serve the purpose of having a top-level place for saving YAML variables #[serde(default, skip_serializing, rename = "definitions")] diff --git a/src/concepts/filter.rs b/src/concepts/filter.rs index 08b3b5a..b487e8a 100644 --- a/src/concepts/filter.rs +++ b/src/concepts/filter.rs @@ -19,7 +19,6 @@ use super::{Action, Match, Pattern, Patterns}; #[derive(Clone, Debug, Default, Deserialize, Serialize)] #[serde(deny_unknown_fields)] pub struct Filter { - actions: BTreeMap, #[serde(skip)] longuest_action_duration: TimeDelta, @@ -38,6 +37,8 @@ pub struct Filter { #[serde(skip)] retry_duration: Option, + actions: BTreeMap, + #[serde(skip)] name: String, #[serde(skip)]