Signal replicator will now use the name of the process managers when notifing what signal was caught.

Processes can set a working directory.
Updating the readme files.

Author: morfien101

READMEs/ConfigrationFile.md

@@ -77,6 +77,8 @@ processes:
     # skip stops this execution if required.
     # Use the template functions to set this value.
     skip: false
+    # Run the process using this dir as the base directory.
+    working_dir: /some/dir
   # init_processes start after secrets and run sequentially
   # This is a list and can have as many items as required.
   init_processes:
@@ -95,6 +97,8 @@ processes:
     # termination_timeout_seconds how long the grace period is for processes to terminate.
     # The default is 1 second.
     termination_timeout_seconds: 3
+    # Run the process using this dir as the base directory.
+    working_dir: /some/dir
     # logging_config is used to forward on the logs from this process.
     logging_config:
       # This section contains a Logging config _see below_
@@ -116,6 +120,10 @@ processes:
     - 1
     - -b
     - foo and bar
+    # Run the process using this dir as the base directory.
+    working_dir: /some/dir
+    # Delay the start of a process for x number of seconds.
+    start_delay_seconds: 60
     logging_config:
       # This section contains a Logging config _see below_
 ```

READMEs/README.md

@@ -7,12 +7,12 @@ Take a look around.
 
 ### Configuration files
 
-[Configuration Documentation](ConfigurationFile.md)
+[Configuration Documentation](./ConfigurationFile.md)
 
 ### Logging
 
-[Logging Documentation](Logging.md)
+[Logging Documentation](./Logging.md)
 
 ### Secrets
 
-[Secrets Documentation](Secrets.md)
+[Secrets Documentation](./Secrets.md)

build_and_test.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+set -e
+
 # Use "./build_and_test.sh" to run only the tests
 # Use "./build_and_test.sh gobuild" to also rebuild the go project
 

configfile/processes.go

@@ -10,21 +10,23 @@ type Processes struct {
 // Process is a struct that consumes a yaml configration and holds config for a
 // process that needs to be run.
 type Process struct {
-	Name          string        `yaml:"name"`
-	CMD           string        `yaml:"command"`
-	Args          []string      `yaml:"arguments"`
-	LoggerConfig  LoggingConfig `yaml:"logging_config"`
-	CombindOutput bool          `yaml:"combine_output,omitempty"`
-	TermTimeout   int           `yaml:"termination_timeout_seconds,omitempty"`
-	StartDelay    int           `yaml:"start_delay_seconds,omitempty"`
+	Name             string        `yaml:"name"`
+	CMD              string        `yaml:"command"`
+	Args             []string      `yaml:"arguments"`
+	LoggerConfig     LoggingConfig `yaml:"logging_config"`
+	CombindOutput    bool          `yaml:"combine_output,omitempty"`
+	TermTimeout      int           `yaml:"termination_timeout_seconds,omitempty"`
+	StartDelay       int           `yaml:"start_delay_seconds,omitempty"`
+	WorkingDirectory string        `yaml:"working_dir,omitempty"`
 }
 
 // SecretProcess is a struct that consumes a yaml configration and holds config for a
 // secret collection process that needs to be run.
 type SecretProcess struct {
-	Name        string   `yaml:"name"`
-	CMD         string   `yaml:"command"`
-	Args        []string `yaml:"arguments"`
-	TermTimeout int      `yaml:"termination_timeout_seconds,omitempty"`
-	Skip        bool     `yaml:"skip"`
+	Name             string   `yaml:"name"`
+	CMD              string   `yaml:"command"`
+	Args             []string `yaml:"arguments"`
+	TermTimeout      int      `yaml:"termination_timeout_seconds,omitempty"`
+	Skip             bool     `yaml:"skip"`
+	WorkingDirectory string   `yaml:"working_dir,omitempty"`
 }

main.go

@@ -63,14 +63,6 @@ The error was: %s`, err)
 	// Setup signal capture
 	signals := make(chan os.Signal, 1)
 	signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
-	go func() {
-		for receivedSignal := range signals {
-			// Signals can come from inside and outside. The signals can come from the user/deamon running the container
-			// or it can come from a process termination. In either case we need to send the signals to the replicator
-			// to forward it onto the running processes.
-			signalreplicator.Send(receivedSignal)
-		}
-	}()
 
 	// Create a limited logger that will be thrown away once we fired up our actual loggers.
 	loggers := processlogger.New(
@@ -92,6 +84,17 @@ The error was: %s`, err)
 		terminate(1, loggers)
 	}
 
+	// At this point we can start to handle signals.
+	go func() {
+		for receivedSignal := range signals {
+			// Signals can come from inside and outside. The signals can come from the user/deamon running the container
+			// or it can come from a process termination. In either case we need to send the signals to the replicator
+			// to forward it onto the running processes.
+			pmlogger.Printf("Got signal '%s'\n", receivedSignal)
+			signalreplicator.Send(receivedSignal)
+		}
+	}()
+
 	// Collect secrets
 	// This can only use the temp logger because we can't yet start the
 	// the full loggers. Some of them will require secrets from the collection

processmanager/process.go

@@ -50,7 +50,7 @@ func (p *Process) processStartDelay() {
 // has exited either good or bad.
 func (p *Process) runProcess(processType string) *processEnd {
 	finalState := &processEnd{
-		Name:        p.config.CMD,
+		Name:        p.config.Name,
 		ProcessType: processType,
 		ExitCode:    -1,
 	}

processmanager/processmanager.go

@@ -197,7 +197,7 @@ func (pm *ProcessManger) exitStatusFormatter() string {
 // Setup Process will link create the process object and also link the stdout and stderr.
 // An error is returned if anything fails.
 func (pm *ProcessManger) setupProcess(proc *Process) error {
-	execProc, stdout, stderr, err := createRunableProcess(proc.config.CMD, proc.config.Args, proc.sigChan)
+	execProc, stdout, stderr, err := createRunableProcess(proc.config, proc.sigChan)
 	if err != nil {
 		return err
 	}
@@ -214,12 +214,16 @@ func (pm *ProcessManger) setupProcess(proc *Process) error {
 // We can use this in processes managed by the process manager or secret processes which are just
 // single processes.
 func createRunableProcess(
-	command string,
-	arguments []string,
+	config *configfile.Process,
 	signalChan chan os.Signal,
 ) (*exec.Cmd, io.ReadCloser, io.ReadCloser, error) {
 	signalreplicator.Register(signalChan)
-	execProc := exec.Command(command, arguments...)
+	execProc := exec.Command(config.CMD, config.Args...)
+
+	// If we have a working dir. Set it here.
+	if config.WorkingDirectory != "" {
+		execProc.Dir = config.WorkingDirectory
+	}
 
 	stdout, err := execProc.StdoutPipe()
 	if err != nil {

signalreplicator/signal.go

@@ -30,7 +30,6 @@ func Remove(ch chan os.Signal) {
 
 // Send will take a signal that needs to be replicated
 func Send(s os.Signal) {
-	fmt.Println("got signal", s)
 	globalReplicator.input <- s
 }