Write plain text encoder.

flags.go

@@ -124,7 +124,7 @@ func HandleFlags() {
 	*format = strings.ToLower(*format)
 	switch *format {
 	case "plain":
-		break
+		encoder = PlainEncoder{*sampleFilename, logFile}
 	case "csv":
 		encoder = csv.NewEncoder(logFile)
 	case "json":
@@ -205,3 +205,17 @@ func (uf UniqueFilter) Filter(msg parse.Message) bool {
 	copy(uf[mid], checksum)
 	return true
 }
+
+type PlainEncoder struct {
+	sampleFilename string
+	logFile        *os.File
+}
+
+func (pe PlainEncoder) Encode(msg interface{}) (err error) {
+	if pe.sampleFilename == os.DevNull {
+		_, err = fmt.Fprintln(pe.logFile, msg.(parse.LogMessage).StringNoOffset())
+	} else {
+		_, err = fmt.Fprintln(pe.logFile, msg.(parse.LogMessage))
+	}
+	return
+}

recv.go

@@ -167,24 +167,15 @@ func (rcvr *Receiver) Run() {
 				msg.Length = rcvr.p.Cfg().BufferLength << 1
 				msg.Message = pkt
 
-				if encoder == nil {
-					// A nil encoder is just plain-text output.
-					if *sampleFilename == os.DevNull {
-						fmt.Fprintln(logFile, msg.StringNoOffset())
-					} else {
-						fmt.Fprintln(logFile, msg)
-					}
-				} else {
-					err = encoder.Encode(msg)
-					if err != nil {
-						log.Fatal("Error encoding message: ", err)
-					}
+				err = encoder.Encode(msg)
+				if err != nil {
+					log.Fatal("Error encoding message: ", err)
+				}
 
-					// The XML encoder doesn't write new lines after each
-					// element, add them.
-					if _, ok := encoder.(*xml.Encoder); ok {
-						fmt.Fprintln(logFile)
-					}
+				// The XML encoder doesn't write new lines after each
+				// element, add them.
+				if _, ok := encoder.(*xml.Encoder); ok {
+					fmt.Fprintln(logFile)
 				}
 
 				pktFound = true