diff --git a/src/detections/detection.rs b/src/detections/detection.rs index 9779e1c6..99488df5 100644 --- a/src/detections/detection.rs +++ b/src/detections/detection.rs @@ -57,7 +57,7 @@ impl Detection { // ルールファイルをパースします。 pub fn parse_rule_files( level: String, - rulespath: &PathBuf, + rulespath: &Path, exclude_ids: &filter::RuleExclude, ) -> Vec { // ルールファイルのパースを実行 @@ -409,7 +409,7 @@ mod tests { #[test] fn test_parse_rule_files() { let level = "informational"; - let opt_rule_path = Some("./test_files/rules/level_yaml"); + let opt_rule_path = Path::new("./test_files/rules/level_yaml"); let cole = Detection::parse_rule_files(level.to_owned(), opt_rule_path, &filter::exclude_ids()); assert_eq!(5, cole.len()); diff --git a/src/detections/utils.rs b/src/detections/utils.rs index 821912b3..e14f8496 100644 --- a/src/detections/utils.rs +++ b/src/detections/utils.rs @@ -186,7 +186,7 @@ pub fn get_event_value<'a>(key: &str, event_value: &'a Value) -> Option<&'a Valu pub fn get_thread_num() -> usize { let conf = configs::CONFIG.read().unwrap(); - conf.args.thread_number.unwrap_or(num_cpus::get()) + conf.args.thread_number.unwrap_or_else(num_cpus::get()) } pub fn create_tokio_runtime() -> Runtime {