Fix merge conflicts.

audit.go

@@ -59,14 +59,18 @@ func main() {
 	if err != nil {
 		logrus.WithError(err).Fatal("failed to create netlink client")
 	}
+	filter, err := createFilters(config)
+	if err != nil {
+		logrus.WithError(err).Fatal("failed to create filters")
+	}
 	marshaller := NewAuditMarshaller(
 		writer,
 		uint16(config.Events.Min),
 		uint16(config.Events.Max),
 		config.MessageTracking.Enabled,
 		config.MessageTracking.LogOutOfOrder,
 		config.MessageTracking.MaxOutOfOrder,
-		createFilters(config),
+		filter,
 	)
 
 	logrus.Infof("started processing events in the range [%d, %d]", config.Events.Min, config.Events.Max)
@@ -315,7 +319,7 @@ func createKafkaOutput(ctx context.Context, config *Config) (*AuditWriter, error
 	return NewAuditWriter(kw, attempts), nil
 }
 
-func createFilters(config *Config) []AuditFilter {
+func createFilters(config *Config) ([]AuditFilter, error) {
 	var (
 		err     error
 		filters []AuditFilter
@@ -332,23 +336,23 @@ func createFilters(config *Config) []AuditFilter {
 		}
 		if f.Regex != "" {
 			if af.regex, err = regexp.Compile(f.Regex); err != nil {
-				logrus.WithError(err).Fatalf("`regex` in filter %d could not be parsed: %s", i+1, f.Regex)
+				return nil, fmt.Errorf("`regex` in filter %d could not be parsed: %s", i+1, f.Regex)
 			}
 		}
 		if f.Syscall != 0 {
 			af.syscall = strconv.Itoa(f.Syscall)
 		}
 
 		if af.regex == nil {
-			return filters, fmt.Errorf("Filter %d is missing the `regex` entry", i+1)
+			return nil, fmt.Errorf("Filter %d is missing the `regex` entry", i+1)
 		}
 
 		if af.syscall == "" {
-			return filters, fmt.Errorf("Filter %d is missing the `syscall` entry", i+1)
+			return nil, fmt.Errorf("Filter %d is missing the `syscall` entry", i+1)
 		}
 
 		if af.messageType == 0 {
-			return filters, fmt.Errorf("Filter %d is missing the `message_type` entry", i+1)
+			return nil, fmt.Errorf("Filter %d is missing the `message_type` entry", i+1)
 		}
 
 		filters = append(filters, af)