Filters now run in own goroutine. Not run by Streams anymore.

conf.go

@@ -1,7 +1,6 @@
-package main
+package reaction
 
 import (
-	// "flag"
 	"fmt"
 	"log"
 	"os"
@@ -37,6 +36,8 @@ type Filter struct {
 	retryDuration time.Duration
 
 	Actions map[string]*Action
+
+	matches map[string][]time.Time
 }
 
 type Action struct {

reaction.go

@@ -1,18 +1,20 @@
-package main
+package reaction
 
 import (
 	"bufio"
 	"flag"
+	// "fmt"
 	"log"
 	"os"
 	"os/exec"
 	"strings"
+	"sync"
 	"time"
 )
 
 // Executes a command and channel-send its stdout
-func cmdStdout(commandline []string) chan string {
+func cmdStdout(commandline []string) chan *string {
-	lines := make(chan string)
+	lines := make(chan *string)
 
 	go func() {
 		cmd := exec.Command(commandline[0], commandline[1:]...)
@@ -27,7 +29,8 @@ func cmdStdout(commandline []string) chan string {
 
 		scanner := bufio.NewScanner(stdout)
 		for scanner.Scan() {
-			lines <- scanner.Text()
+			line := scanner.Text()
+			lines <- &line
 		}
 		close(lines)
 	}()
@@ -36,14 +39,14 @@ func cmdStdout(commandline []string) chan string {
 }
 
 // Whether one of the filter's regexes is matched on a line
-func (f *Filter) match(line string) string {
+func (f *Filter) match(line *string) string {
 	for _, regex := range f.compiledRegex {
 
-		if matches := regex.FindStringSubmatch(line); matches != nil {
+		if matches := regex.FindStringSubmatch(*line); matches != nil {
 
 			match := matches[regex.SubexpIndex(f.patternName)]
 
-			log.Printf("INFO %s.%s: match `%v`\n", f.stream.name, f.name, match)
+			log.Printf("INFO %s.%s: match [%v]\n", f.stream.name, f.name, match)
 			return match
 		}
 	}
@@ -52,11 +55,13 @@ func (f *Filter) match(line string) string {
 
 func (f *Filter) execActions(match string) {
 	for _, a := range f.Actions {
+		wgActions.Add(1)
 		go a.exec(match)
 	}
 }
 
 func (a *Action) exec(match string) {
+	defer wgActions.Done()
 	if a.afterDuration != 0 {
 		time.Sleep(a.afterDuration)
 	}
@@ -75,21 +80,55 @@ func (a *Action) exec(match string) {
 	}
 }
 
-func (s *Stream) handle() {
+func (f *Filter) handle() chan *string {
+	lines := make(chan *string)
+
+	go func() {
+		for line := range lines {
+			if match := f.match(line); match != "" {
+				f.execActions(match)
+			}
+		}
+	}()
+
+	return lines
+}
+
+func multiplex(input chan *string, outputs []chan *string) {
+	var wg sync.WaitGroup
+	for item := range input {
+		for _, output := range outputs {
+			wg.Add(1)
+			go func(s *string) {
+				output <- s
+				wg.Done()
+			}(item)
+		}
+	}
+	for _, output := range outputs {
+		wg.Wait()
+		close(output)
+	}
+}
+
+func (s *Stream) handle(signal chan *Stream) {
 	log.Printf("INFO %s: start %s\n", s.name, s.Cmd)
 
 	lines := cmdStdout(s.Cmd)
 
-	for line := range lines {
+	var filterInputs = make([]chan *string, 0, len(s.Filters))
 	for _, filter := range s.Filters {
-			if match := filter.match(line); match != "" {
+		filterInputs = append(filterInputs, filter.handle())
-				filter.execActions(match)
-			}
-		}
-	}
 	}
 
-func main() {
+	multiplex(lines, filterInputs)
+
+	signal <- s
+}
+
+var wgActions sync.WaitGroup
+
+func Main() {
 	confFilename := flag.String("c", "", "configuration file. see an example at https://framagit.org/ppom/reaction/-/blob/main/reaction.yml")
 	flag.Parse()
 
@@ -100,9 +139,18 @@ func main() {
 
 	conf := parseConf(*confFilename)
 
+	endSignals := make(chan *Stream)
+
 	for _, stream := range conf.Streams {
-		go stream.handle()
+		go stream.handle(endSignals)
 	}
-	// Infinite wait
+
-	<-make(chan bool)
+	for i := 0; i < len(conf.Streams); i++ {
+		finishedStream := <-endSignals
+		log.Printf("ERR  %s stream finished", finishedStream.name)
+	}
+
+	wgActions.Wait()
+
+	os.Exit(3)
 }

reaction.yml

@@ -8,7 +8,7 @@ patterns:
 
 streams:
   tailDown:
-    cmd: [ "tail", "-f", "/home/ao/DOWN" ]
+    cmd: [ "tail", "/home/ao/DOWN" ]
     filters:
       findIP:
         regex: