Add template for output

Author: mblaschke

etc/go-syslog.yml

@@ -5,6 +5,8 @@ syslog:
   perms: 0666
   filter:
     facility: "auth,authpriv"
+  output:
+    template: "[SYSLOG] %s"
 
 pipes:
   -
@@ -15,3 +17,5 @@ pipes:
     path: /docker.stderr
     type: stderr
     perms: 0666
+    output:
+      template: "[STDERR] %s"

pipe.go

@@ -13,13 +13,17 @@ type Pipe struct {
     Path  string
     Type  string
     Perms string
+
+    Output struct {
+        Template string
+    }
 }
 
 // Create and handle log data from pipe
 func handlePipe(pipe Pipe) {
     pipeExists := false
 
-    LoggerStdout.Verbose(fmt.Sprintf(" -> Starting named pipe (%s)", pipe.Path))
+    LoggerStdout.Verbose(fmt.Sprintf(" -> starting named pipe (%s)", pipe.Path))
 
     // get pipe permissions
     if pipe.Perms == "" {
@@ -63,11 +67,16 @@ func handlePipe(pipe Pipe) {
         }
 
         if message != "" {
+
+            if pipe.Output.Template != "" {
+                message = fmt.Sprintf(pipe.Output.Template, message)
+            }
+
             switch pipe.Type {
                 case "stdout":
-                    LoggerStdout.Println(message)
+                    LoggerStdout.Print(message)
                 case "stderr":
-                    LoggerStderr.Println(message)
+                    LoggerStderr.Print(message)
             }
         }
     }

syslog.go

@@ -13,6 +13,9 @@ type Syslog struct {
         Facility string
         facility int
     }
+    Output struct {
+        Template string
+    }
 }
 
 
@@ -53,7 +56,7 @@ var SyslogFacilityLookup = map[int]string {
 }
 
 func handleSyslog() {
-    LoggerStdout.Verbose(fmt.Sprintf(" -> Starting syslog daemon (%s)", configuration.Syslog.Path))
+    LoggerStdout.Verbose(fmt.Sprintf(" -> starting syslog daemon (%s)", configuration.Syslog.Path))
 
     // Check if syslog path exists, remove if already existing
     _, err := os.Stat(configuration.Syslog.Path)
@@ -77,13 +80,14 @@ func handleSyslog() {
                 continue
             }
 
-            facilityId := logParts["facility"].(int)
-            facility := "custom"
-            if val, ok := SyslogFacilityLookup[facilityId]; ok {
-                facility = val
+            // build message
+            message := logParts["content"]
+
+            // custom template
+            if configuration.Syslog.Output.Template != "" {
+                message = fmt.Sprintf(configuration.Syslog.Output.Template, message)
             }
 
-            message := fmt.Sprintf("%s: %s", facility, logParts["content"])
             LoggerStdout.Println(message)
         }
     }(channel)