Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ pub enum IxaError {
#[error("invalid log level format: {log_level}")]
InvalidLogLevelFormat { log_level: String },

#[error("invalid runner config section `{section}`: {message}")]
InvalidRunnerConfig { section: String, message: String },

#[error("cannot make edge to self")]
CannotMakeEdgeToSelf,
#[error("invalid weight")]
Expand Down
25 changes: 16 additions & 9 deletions src/global_properties.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,21 @@ fn get_global_property_setter_for_config_key(name: &str) -> Option<Arc<PropertyS
})
}

pub(crate) fn load_global_properties_from_map(
context: &mut Context,
val: serde_json::Map<String, serde_json::Value>,
) -> Result<(), IxaError> {
for (k, v) in val {
if let Some(setter) = get_global_property_setter_for_config_key(&k) {
setter(context, &k, v)?;
} else {
return Err(IxaError::NoGlobalProperty { name: k });
}
}

Ok(())
}

/// The trait representing a global property. Do not use this
/// directly, but instead define global properties with
/// [`define_global_property!`](crate::define_global_property!).
Expand Down Expand Up @@ -266,15 +281,7 @@ impl ContextGlobalPropertiesExt for Context {
let reader = BufReader::new(config_file);
let val: serde_json::Map<String, serde_json::Value> = serde_json::from_reader(reader)?;

for (k, v) in val {
if let Some(setter) = get_global_property_setter_for_config_key(&k) {
setter(self, &k, v)?;
} else {
return Err(IxaError::NoGlobalProperty { name: k });
}
}

Ok(())
load_global_properties_from_map(self, val)
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ pub mod report;
pub use report::{ConfigReportOptions, ContextReportExt, Report};

pub mod runner;
pub use runner::{run_with_args, run_with_custom_args, BaseArgs};
pub use runner::{run_with_args, run_with_custom_args, run_with_merged_args, BaseArgs, RunnerArgs};

pub mod log;
pub use log::{
Expand Down
Loading