simplify reading lines

elastic · May 30, 2018 · e982a79 · e982a79
1 parent 12e2a58
commit e982a79
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 21 deletions.
diff --git a/auditbeat/include/fields.go b/auditbeat/include/fields.go
diff --git a/filebeat/include/fields.go b/filebeat/include/fields.go
diff --git a/heartbeat/include/fields.go b/heartbeat/include/fields.go
diff --git a/libbeat/generator/fields/fields.go b/libbeat/generator/fields/fields.go
@@ -3,7 +3,6 @@ package fields
 import (
 	"bufio"
 	"fmt"
-	"io"
 	"io/ioutil"
 	"os"
 	"path"
@@ -55,25 +54,17 @@ func writeGeneratedFieldsYml(beatsPath string, fieldFiles []*YmlFile) error {
 			return err
 		}
 
-		fr := bufio.NewReader(ff)
-		for {
-			l, err := fr.ReadString('\n')
-			if err != nil {
-				if err == io.EOF {
-					err = writeIndentedLine(fw, l+"\n", p.Indent)
-					if err != nil {
-						return err
-					}
-					break
-				}
-				return err
-			}
-			err = writeIndentedLine(fw, l, p.Indent)
+		fs := bufio.NewScanner(ff)
+		for fs.Scan() {
+			err = writeIndentedLine(fw, fs.Text()+"\n", p.Indent)
 			if err != nil {
 				return err
 			}
 
 		}
+		if err := fs.Err(); err != nil {
+			return err
+		}
 	}
 	return nil
 }

diff --git a/metricbeat/include/fields.go b/metricbeat/include/fields.go