improving error messages, updating .gitignore and README

Andrew Steurer · Andrew Steurer · commit 58b8c6c9de31 · 2024-08-16T10:05:00.000-06:00
Signed-off-by: Andrew Steurer &lt;andrew.steurer@fermyon.com&gt;
diff --git a/cmd/cleanup.go b/cmd/cleanup.go
@@ -37,6 +37,10 @@ func getIDs(dockerOutput []byte) []string {
 }
 
 func cleanUp() error {
+	if err := checkDocker(); err != nil {
+		return err
+	}
+
 	fmt.Println("Stopping Spin OTel Docker containers...")
 
 	getContainers := exec.Command("docker", "ps")
diff --git a/cmd/root.go b/cmd/root.go
@@ -57,8 +57,6 @@ func Execute() {
 	}
 
 	if err := rootCmd.Execute(); err != nil {
-		// The docs use fmt.Fprintln(os.Stderr, err) here; however it's not necessary,
-		// and sometimes results in an error message printing twice
 		os.Exit(1)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,10 @@ func getIDs(dockerOutput []byte) []string {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`func cleanUp() error {`
	`40`	`+ if err := checkDocker(); err != nil {`
	`41`	`+ return err`
	`42`	`+ }`
	`43`	`+`
`40`	`44`	`fmt.Println("Stopping Spin OTel Docker containers...")`
`41`	`45`
`42`	`46`	`getContainers := exec.Command("docker", "ps")`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,6 @@ func Execute() {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`if err := rootCmd.Execute(); err != nil {`
`60`		`- // The docs use fmt.Fprintln(os.Stderr, err) here; however it's not necessary,`
`61`		`- // and sometimes results in an error message printing twice`
`62`	`60`	`os.Exit(1)`
`63`	`61`	`}`
`64`	`62`	`}`