Fix facility filter

Author: mblaschke

bit.go

@@ -0,0 +1,23 @@
+package main
+
+// Sets the bit at pos in the integer n
+// Author: Kevin Burke
+func setBit(n int, pos uint) int {
+    n |= (1 << pos)
+    return n
+}
+
+// Clears the bit at pos in n
+// Author: Kevin Burke
+func clearBit(n int, pos uint) int {
+    mask := ^(1 << pos)
+    n &= mask
+    return n
+}
+
+// check if number has bit
+// Author: Kevin Burke
+func hasBit(n int, pos uint) bool {
+    val := n & (1 << pos)
+    return (val > 0)
+}

main.go

@@ -69,13 +69,15 @@ func parseConfiguration() {
         panic(fmt.Sprintf("Unable to parse configuration file %s: %v", opts.Configuration, err.Error()))
     }
 
-    if configuration.Syslog.Path != "" {
-        configuration.Syslog.Filter.facility = 255
+    // set internal defaults
+    configuration.Syslog.Filter.facility = 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 -= facilityId
+                configuration.Syslog.Filter.facility = clearBit(configuration.Syslog.Filter.facility, uint(facilityId))
             }
         }
     }

syslog.go

@@ -37,23 +37,6 @@ var SyslogFacilityMap = map[string]int {
     "console": 14,
 }
 
-var SyslogFacilityLookup = map[int]string {
-    0: "kern",
-    1: "user",
-    2: "mail",
-    3: "daemon",
-    4: "auth",
-    5: "syslog",
-    6: "lpr",
-    7: "news",
-    8: "uucp",
-    9: "cron",
-    10: "authpriv",
-    11: "ftp",
-    12: "ntp",
-    13: "security",
-    14: "console",
-}
 
 func handleSyslog() {
     LoggerStdout.Verbose(fmt.Sprintf(" -> starting syslog daemon (%s)", configuration.Syslog.Path))
@@ -75,13 +58,17 @@ func handleSyslog() {
 
     go func(channel syslog.LogPartsChannel) {
         for logParts := range channel {
+            facilityId := uint(logParts["facility"].(int))
+
             // facility filter
-            if configuration.Syslog.Filter.facility & logParts["facility"].(int) == 0 {
+            if hasBit(configuration.Syslog.Filter.facility, facilityId) == false {
                 continue
             }
 
+            //fmt.Println(logParts)
+
             // build message
-            message := logParts["content"]
+            message := fmt.Sprintf("%s %s", logParts["hostname"], logParts["content"])
 
             // custom template
             if configuration.Syslog.Output.Template != "" {