Fixes before eval

.devcontainer/Dockerfile

@@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y \
 	nginx \
 	&& rm -rf /var/lib/apt/lists/*
 
+RUN groupadd taskmaster
 RUN rustup component add rustfmt clippy
 
 RUN echo 'export PS1="\W> "' >> ~/.bashrc

config/autorestart.toml

@@ -0,0 +1,18 @@
+[processes.no]
+workingdir = "."
+cmd = "/usr/bin/ls"
+autorestart = "no"
+autostart = true
+
+[processes.always]
+workingdir = "."
+cmd = "/usr/bin/ls"
+autorestart = "always"
+autostart = true
+
+[processes.on-failure]
+workingdir = "."
+cmd = "/usr/bin/ls"
+autorestart = "on-failure[:5]"
+exitcodes = [1]
+autostart = true

config/autostart.toml

@@ -0,0 +1,9 @@
+[processes.autostart]
+cmd = "/usr/bin/ls"
+workingdir = "."
+autostart = true
+
+[processes.notautostart]
+cmd = "/usr/bin/ls"
+workingdir = "."
+autostart = false

config/command.toml

@@ -0,0 +1,5 @@
+[processes.command]
+
+cmd = "/usr/bin/echo"
+args = ["Hello, World!"]
+workingdir = "."

config/duplicatestdout.toml

@@ -0,0 +1,11 @@
+[processes.no]
+workingdir = "."
+cmd = "/usr/bin/ls"
+stdout = "asd"
+autostart = true
+
+[processes.always]
+workingdir = "."
+cmd = "/usr/bin/ls"
+stdout = "asd"
+autostart = true

config/env.toml

@@ -0,0 +1,7 @@
+[processes.env]
+
+cmd = "/bin/bash"
+args = ["executables/env.sh"]
+env = [["HELLO", "WORLD"]]
+workingdir = "."
+stdout = "/tmp/env.stdout"

config/example.toml

@@ -1,6 +1,3 @@
-socketpath = "/tmp/.taskmaster.sock"
-authgroup = "winstonallo"
-
 [processes.sleep]
 cmd = "/usr/bin/sleep"
 args = ["1"]

config/exitcode.toml

@@ -0,0 +1,13 @@
+[processes.success]
+cmd = "/bin/bash"
+args = ["-c", "exit 0"]
+workingdir = "."
+exitcodes = [0]
+autostart = true
+
+[processes.failure]
+cmd = "/bin/bash"
+args = ["-c", "exit 1"]
+workingdir = "."
+exitcodes = [0]
+autostart = true

config/felix.toml

@@ -1,6 +1,3 @@
-socketpath = "/tmp/taskmaster.sock"
-authgroup = "root"
-
 [processes.sleep]
 cmd = "/bin/sleep"
 args = ["3"]

config/healthcheck.toml

@@ -1,6 +1,3 @@
-socketpath = "/tmp/.taskmaster.sock"
-
-
 [processes.sleep]
 
 cmd = "/usr/bin/sleep"
@@ -20,5 +17,5 @@ env = [["STARTED_BY", "abied-ch"], ["ANSWER", "42"]]
 cmd = "/usr/bin/sleep"
 args = ["2"]
 backoff = 1
-timeout = 1
+timeout = 5
 retries = 1

config/privilege_deescalation.toml

@@ -1,5 +1,3 @@
-authgroup = "root"
-
 [processes.root]
 
 cmd = "/usr/bin/id"

config/processes.toml

@@ -0,0 +1,8 @@
+[processes.processes]
+
+cmd = "/usr/bin/sleep"
+args = ["1"]
+workingdir = "."
+autorestart = "no"
+autostart = true
+processes = 10

config/attach.toml → config/redirect.toml

@@ -1,15 +1,12 @@
-socketpath = "/tmp/taskmaster.sock"
-authgroup = "winstonallo"
-
 [processes.sleepwrite]
 cmd = "/usr/bin/python3"
-args = ["/home/winstonallo/mastery/taskmaster/executables/sleepwrite.py"]
+args = ["executables/sleepwrite.py"]
 processes = 1
 umask = "022"
-workingdir = "/tmp"
+workingdir = "."
 autostart = true
 autorestart = "always"
-exitcodes = [0, 2]
+exitcodes = [0]
 stopsignals = ["USR1"]
 stoptime = 5
 stdout = "/tmp/sleepwrite.stdout"

config/retries.toml

@@ -0,0 +1,21 @@
+[processes.retries_1]
+cmd = "/usr/bin/sleep"
+args = ["1"]
+workingdir = "."
+autostart = true
+exitcodes = [1]
+[processes.retries_1.healthcheck]
+starttime = 2
+retries = 1
+backoff = 2
+
+[processes.retries_5]
+cmd = "/usr/bin/sleep"
+args = ["1"]
+workingdir = "."
+autostart = true
+exitcodes = [1]
+[processes.retries_5.healthcheck]
+starttime = 2
+retries = 5
+backoff = 2

config/signal.toml

@@ -1,8 +1,8 @@
-authgroup = "winstonallo"
-
 [processes.signal]
 
 cmd = "/usr/bin/python3"
 args = ["executables/signals.py"]
 workingdir = "."
 autostart = true
+stopsignals = ["TERM", "USR1", "ILL"]
+stdout = "/tmp/signal.stdout"

config/stoptime.toml

@@ -0,0 +1,9 @@
+[processes.signal]
+
+cmd = "/usr/bin/python3"
+args = ["executables/signals.py"]
+workingdir = "."
+autostart = true
+stopsignals = ["TERM", "USR1", "ILL"]
+stoptime = 5
+stdout = "/tmp/signal.stdout"

config/umask.toml

@@ -0,0 +1,15 @@
+[processes.000]
+
+cmd = "/usr/bin/touch"
+args = ["000"]
+workingdir = "."
+autostart = true
+umask = "000"
+
+[processes.022]
+
+cmd = "/usr/bin/touch"
+args = ["022"]
+workingdir = "."
+autostart = true
+umask = "022"

config/unexisting_group.toml

@@ -1,4 +1,3 @@
-authgroup = "asdpihgasbldkjalshdbliasjdlkasbdasd"
 
 [processes.sleep]
 cmd = "/usr/bin/sleep"

config/uptime.toml

@@ -0,0 +1,17 @@
+[processes.uptime_success]
+cmd = "/usr/bin/sleep"
+args = ["10"]
+workingdir = "."
+autostart = true
+[processes.uptime_success.healthcheck]
+starttime = 2
+
+[processes.uptime_failure]
+cmd = "/usr/bin/sleep"
+args = ["1"]
+workingdir = "."
+autostart = true
+exitcodes = [1]
+[processes.uptime_failure.healthcheck]
+starttime = 2
+retries = 1

config/workingdir.toml

@@ -0,0 +1,13 @@
+[processes.workingdir_dot]
+
+cmd = "/usr/bin/pwd"
+workingdir = "."
+stdout = "/tmp/workingdir_dot.stdout"
+autostart = true
+
+[processes.workingdir_tmp]
+
+cmd = "/usr/bin/pwd"
+workingdir = "/tmp"
+stdout = "/tmp/workingdir_tmp.stdout"
+autostart = true

executables/env.sh

@@ -0,0 +1 @@
+echo $HELLO

src/bin/taskmaster.rs

@@ -2,19 +2,11 @@ use std::{
     env::{self},
     error::Error,
     fs::remove_file,
-    io::Write,
 };
 
 use tasklib::{conf::Config, log, log_info, run::daemon::Daemon};
 
-const PID_FILE_PATH: &str = "/tmp/taskmaster.pid";
-
-fn write_pid_file() -> Result<(), Box<dyn Error>> {
-    let pid = unsafe { libc::getpid() };
-    let mut pid_file = std::fs::File::create(PID_FILE_PATH)?;
-    pid_file.write_all(pid.to_string().as_bytes())?;
-    Ok(())
-}
+pub const PID_FILE_PATH: &str = "/tmp/taskmaster.pid";
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
@@ -40,8 +32,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
         }
     };
 
-    write_pid_file()?;
-
     log::init(conf.logfile())?;
 
     let mut daemon = Daemon::from_config(conf, arg);

src/bin/taskshell.rs

@@ -200,7 +200,7 @@ async fn attach(name: &str, socket_path: &str, to: &str, mut orig: Option<&mut l
     let stream = match UnixStream::connect(socket_path).await {
         Ok(stream) => stream,
         Err(e) => {
-            eprintln!("could not establish connection on attach socket at path {socket_path}: {e}");
+            eprintln!("Could not establish connection on attach socket at path {socket_path}: {e}.\nIs the process running?");
             return "".to_string();
         }
     };