wip: ready to test

src/init/daemon/starter.rs

@@ -1,22 +1,22 @@
-mod time_calc;
-
 use tokio::task::JoinSet;
 use tokio::process::{Command, Child};
 use tokio_util::sync::CancellationToken;
 use tokio::select;
 use tokio::io::Result as tokio_result;
-use tokio::time::sleep;
+use tokio::time::{sleep, interval};
 use std::time::Duration;
 use std::process::ExitStatus;
 use nix::sys::signal::{kill, Signal};
 use nix::errno::Errno;
 use nix::unistd::Pid;
-use anyhow::Context;
-use time::OffsetDateTime;
-use crate::init::config::{self, CronTimeFieldSpec};
+use anyhow::{Context, anyhow};
+use time::{OffsetDateTime, Duration as TimeDur, Weekday};
+use crate::init::config;
 use crate::init::error::{WingmateInitError, CronConfigError};
 
 
+const CRON_TRIGGER_WAIT_SECS: u64 = 20;
+
 pub fn start_services(ts: &mut JoinSet<Result<(), WingmateInitError>>, cfg: &config::Config, cancel: CancellationToken)
     -> Result<(), WingmateInitError> {
 
@@ -54,7 +54,7 @@ pub fn start_services(ts: &mut JoinSet<Result<(), WingmateInitError>>, cfg: &con
                             match kill(Pid::from_raw(id as i32), Some(Signal::SIGTERM)) {
                                 Ok(_) => {
                                     select! {
-                                        _ = sleep(Duration::from_secs(5)) => {
+                                        _ = sleep(Duration::from_secs(config::MAX_TERM_WAIT_TIME_SECS)) => {
                                             child.kill().await.expect("failed to kill process");
                                         },
                                         result = child.wait() => {
@@ -112,9 +112,8 @@ pub fn start_cron(ts: &mut JoinSet<Result<(), WingmateInitError>>, cfg: &config:
     -> Result<(), WingmateInitError> {
 
     for c_ in cfg.get_cron_iter() {
-        let shell = cfg.get_shell().ok_or::<WingmateInitError>(WingmateInitError::NoShellAvailable)?;
         let cron = c_.clone();
-        let cancel = cancel.clone();
+        let in_loop_cancel = cancel.clone();
 
         ts.spawn(async move {
             if cron.day_of_month != config::CronTimeFieldSpec::Any
@@ -123,19 +122,137 @@ pub fn start_cron(ts: &mut JoinSet<Result<(), WingmateInitError>>, cfg: &config:
             }
 
             // let cron = cron.clone();
+            let mut cron_interval = interval(Duration::from_secs(CRON_TRIGGER_WAIT_SECS));
+            let mut cron_procs: JoinSet<Result<(), WingmateInitError>> = JoinSet::new();
             let mut last_running: Option<OffsetDateTime> = None;
             'continuous: loop {
                 let cron = cron.clone();
+                let cron_proc_cancel = in_loop_cancel.clone();
                 
-                time_calc::wait_calc(cron.clone(), &last_running);
-                select! {
-                    _ = cancel.cancelled() => {
-                        break 'continuous;
+                let mut flag = true;
+
+                if let Ok(local_time) = OffsetDateTime::now_local() {
+                    if let Some(last) = last_running {
+                        if local_time - last < TimeDur::minutes(1) {
+                            flag = false;
+                        } else {
+                            flag = flag && cron.minute.is_match(local_time.minute()) &&
+                                cron.hour.is_match(local_time.hour()) &&
+                                cron.day_of_month.is_match(local_time.day()) &&
+                                cron.day_of_week.is_match(weekday_map(local_time.weekday()));
+                        }
+                    }
+
+                    if flag {
+                        last_running = Some(local_time);
+                        cron_procs.spawn(async move {
+                            run_cron_command(cron.command.clone(), cron_proc_cancel).await
+                        });
+                    }    
+                }
+
+                if cron_procs.is_empty() {
+                    select! {
+                        _ = in_loop_cancel.cancelled() => {
+                            break 'continuous;
+                        },
+                        _ = cron_interval.tick() => {},
+                    }    
+                } else {
+                    'task: while !cron_procs.is_empty() {
+                        select! {
+                            opt_res = cron_procs.join_next() => {
+                                if let Some(res) = opt_res {
+                                    if let Err(e) = res {
+                                        eprintln!("running cron got problem {:?}", e);
+                                    }                                        
+                                }
+                            },
+                            _ = in_loop_cancel.cancelled() => {
+                                while let Some(res) = cron_procs.join_next().await {
+                                    if let Err(e) = res {
+                                        eprintln!("running cron got problem {:?}", e);
+                                    }                                        
+                                }
+                                break 'continuous;
+                            },
+                            _ = cron_interval.tick() => {
+                                break 'task;
+                            },
+                        }
                     }
                 }
             }
             Ok(())
         });
     }
+    Ok(())
+}
+
+fn weekday_map(wd: Weekday) -> u8 {
+    match wd {
+        Weekday::Sunday => 0,
+        Weekday::Monday => 1,
+        Weekday::Tuesday => 2,
+        Weekday::Wednesday => 3,
+        Weekday::Thursday => 4,
+        Weekday::Friday => 5,
+        Weekday::Saturday => 6
+    }
+}
+
+async fn run_cron_command(command: String, cancel: CancellationToken) -> Result<(), WingmateInitError> {
+    let mut args: Vec<&str> = Vec::new();
+    for part in command.split(' ') {
+        if part.len() > 0 {
+            args.push(part);
+        }
+    }
+
+    if args.is_empty() {
+        return Err(WingmateInitError::Other { source: anyhow!("parsed as empty: {}", command) });
+    }
+
+    let cmd = args.swap_remove(0);
+    let mut child: Child;
+    if args.is_empty() {
+        child = Command::new(cmd).spawn().map_err(|e| {
+            WingmateInitError::SpawnError { source: e, message: command }
+        })?;
+    } else {
+        child = Command::new(cmd).args(args.as_slice()).spawn().map_err(|e| {
+            WingmateInitError::SpawnError { source: e, message: command }
+        })?;
+    }
+
+    select! {
+        _ = cancel.cancelled() => {
+            if let Some(id) = child.id() {
+                match kill(Pid::from_raw(id as i32), Some(Signal::SIGTERM)) {
+                    Ok(_) => {
+                        if let Err(e) = result_match(child.wait().await) {
+                            return Err(WingmateInitError::ChildExit { source: e });
+                        }            
+                    },
+                    Err(e) => {
+                        match e {
+                            Errno::ESRCH => {
+                                return Err(WingmateInitError::ChildNotFound);
+                            },
+                            _ => {
+                                return Err(WingmateInitError::FromNix { source: e });
+                            }
+                        }
+                    }        
+                }
+            }
+        },
+        result = child.wait() => {
+            if let Err(e) = result_match(result) {
+                return Err(WingmateInitError::ChildExit { source: e });
+            }
+        }
+    }
+
     Ok(())
 }