Implement severity filtering

Author: mblaschke

etc/go-syslog.yml

@@ -10,8 +10,10 @@ syslog:
   perms: 0666
 
   # Message filtering
+  # these messages will NOT be shown
   filter:
     facility: "auth,authpriv"
+    severity: "debug,info"
 
   # Output manipulation
   output:

main.go

@@ -71,15 +71,29 @@ func parseConfiguration() {
 
     // set internal defaults
     configuration.Syslog.Filter.facility = 9223372036854775807
+    configuration.Syslog.Filter.severity = 9223372036854775807
 
     // init syslog configuration
     if configuration.Syslog.Path != "" {
+
         // Facility filter
-        for _, facility := range strings.Split(configuration.Syslog.Filter.Facility, ",") {
-            if facilityId, ok := SyslogFacilityMap[facility]; ok {
-                configuration.Syslog.Filter.facility = clearBit(configuration.Syslog.Filter.facility, uint(facilityId))
+        if configuration.Syslog.Filter.Facility != "" {
+            for _, facility := range strings.Split(configuration.Syslog.Filter.Facility, ",") {
+                if facilityId, ok := SyslogFacilityMap[facility]; ok {
+                    configuration.Syslog.Filter.facility = clearBit(configuration.Syslog.Filter.facility, uint(facilityId))
+                }
             }
         }
+
+        // Severity filter
+        if configuration.Syslog.Filter.Severity != "" {
+            for _, severity := range strings.Split(configuration.Syslog.Filter.Severity, ",") {
+                if severityId, ok := SyslogPriorityMap[severity]; ok {
+                    configuration.Syslog.Filter.severity = clearBit(configuration.Syslog.Filter.severity, uint(severityId))
+                }
+            }
+        }
+
     }
 }
 

syslog.go

@@ -12,6 +12,9 @@ type Syslog struct {
     Filter struct {
         Facility string
         facility int
+
+        Severity string
+        severity int
     }
     Output struct {
         Template string
@@ -46,6 +49,21 @@ var SyslogFacilityMap = map[string]int {
     "local7": 23,
 }
 
+var SyslogPriorityMap = map[string]int {
+    "emerg": 0,
+    "emergency": 0,
+    "alert": 1,
+    "crit": 2,
+    "critical": 2,
+    "err": 3,
+    "error": 3,
+    "warn": 4,
+    "warning": 4,
+    "notice": 5,
+    "info": 6,
+    "dbg": 7,
+    "debug": 7,
+}
 
 func handleSyslog() {
     LoggerStdout.Verbose(fmt.Sprintf(" -> starting syslog daemon (%s)", configuration.Syslog.Path))
@@ -68,12 +86,18 @@ func handleSyslog() {
     go func(channel syslog.LogPartsChannel) {
         for logParts := range channel {
             facilityId := uint(logParts["facility"].(int))
+            severityId := uint(logParts["severity"].(int))
 
             // facility filter
             if hasBit(configuration.Syslog.Filter.facility, facilityId) == false {
                 continue
             }
 
+            // severity filter
+            if hasBit(configuration.Syslog.Filter.severity, severityId) == false {
+                continue
+            }
+
             //fmt.Println(logParts)
 
             // build message