reflect: reflect

This commit is contained in:
2020-10-18 22:57:26 +08:00
parent fdbb1b9443
commit bd82cff4f1

View File

@@ -6,7 +6,7 @@ use log::LevelFilter;
use chrono::prelude::*; use chrono::prelude::*;
use serde::{ Deserialize, Serialize }; use serde::{ Deserialize, Serialize };
use file_lock::FileLock; use file_lock::FileLock;
use rust_util::{ util_str::read_str_to_lines, util_file::locate_file }; use rust_util::{ util_str, util_file };
use dingtalk::DingTalk; use dingtalk::DingTalk;
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -71,7 +71,7 @@ fn main() {
} }
fn parse_keep_running_config() -> Option<KeepRunningConfig> { fn parse_keep_running_config() -> Option<KeepRunningConfig> {
let config_file_opt = locate_file(&[ let config_file_opt = util_file::locate_file(&[
"keeprunningd.json".into(), "keeprunningd.json".into(),
"~/keeprunningd.json".into(), "~/keeprunningd.json".into(),
"/etc/keeprunningd.json".into() "/etc/keeprunningd.json".into()
@@ -112,7 +112,7 @@ fn parse_keep_running_config() -> Option<KeepRunningConfig> {
fn keep_runningd(keep_running_config: Arc<KeepRunningConfig>) { fn keep_runningd(keep_running_config: Arc<KeepRunningConfig>) {
let t = thread::spawn(move || { let t = thread::spawn(move || {
let ps_aux_lines = read_str_to_lines(&match ps_aux() { Some(p) => p, None => return, }); let ps_aux_lines = util_str::read_str_to_lines(&match ps_aux() { Some(p) => p, None => return, });
for keep_running_config_item in &keep_running_config.items { for keep_running_config_item in &keep_running_config.items {
let check_lines = ps_aux_lines.iter().filter(|ln| { let check_lines = ps_aux_lines.iter().filter(|ln| {
keep_running_config_item.grep_tokens.iter().all(|t| ln.contains(t)) keep_running_config_item.grep_tokens.iter().all(|t| ln.contains(t))