add more error checking and print to stderr (#7796)

elastic · Jul 30, 2018 · f94bba4 · f94bba4
1 parent f771f2d
commit f94bba4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/libbeat/generator/fields/fields.go b/libbeat/generator/fields/fields.go
@@ -81,7 +81,10 @@ func writeGeneratedFieldsYml(beatPath string, fieldFiles []*YmlFile, output stri
 
 	if output == "-" {
 		fw := bufio.NewWriter(os.Stdout)
-		fw.Write(data)
+		_, err = fw.Write(data)
+		if err != nil {
+			return err
+		}
 		return fw.Flush()
 	}
 
@@ -93,7 +96,10 @@ func writeGeneratedFieldsYml(beatPath string, fieldFiles []*YmlFile, output stri
 	defer f.Close()
 
 	fw := bufio.NewWriter(f)
-	fw.Write(data)
+	_, err = fw.Write(data)
+	if err != nil {
+		return err
+	}
 	return fw.Flush()
 }
 

diff --git a/libbeat/scripts/cmd/global_fields/main.go b/libbeat/scripts/cmd/global_fields/main.go
@@ -71,7 +71,7 @@ func main() {
 	// it's not a problem because all of them has unique fields.yml files somewhere.
 	if len(beatFieldsPaths) == 0 && os.SameFile(esBeatsInfo, beatInfo) {
 		if output != "-" {
-			fmt.Println("No field files to collect")
+			fmt.Fprintln(os.Stderr, "No field files to collect")
 		}
 		return
 	}
@@ -95,7 +95,5 @@ func main() {
 		os.Exit(3)
 	}
 
-	if output != "-" {
-		fmt.Printf("Generated fields.yml for %s\n", name)
-	}
+	fmt.Fprintf(os.Stderr, "Generated fields.yml for %s to %s\n", name, filepath.Join(beatPath, output))
 }