Merge pull request #253 from mergestat/summarize-error-handling

fix: error handling for summarize commands
mergestat · Feb 15, 2022 · 7e5a991 · 7e5a991
2 parents adbc040 + 3094f5c
commit 7e5a991
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/cmd/summarize/blame/blame.go b/cmd/summarize/blame/blame.go
@@ -467,5 +467,9 @@ func (t *TermUI) PrintJSON() string {
 }
 
 func (t *TermUI) Close() error {
-	return t.db.Close()
+	defer t.db.Close()
+	if t.err != nil {
+		return t.err
+	}
+	return nil
 }
diff --git a/cmd/summarize/commits/commits.go b/cmd/summarize/commits/commits.go
@@ -435,5 +435,9 @@ func (t *TermUI) PrintJSON() string {
 }
 
 func (t *TermUI) Close() error {
-	return t.db.Close()
+	defer t.db.Close()
+	if t.err != nil {
+		return t.err
+	}
+	return nil
 }
diff --git a/cmd/summarize_blame.go b/cmd/summarize_blame.go
@@ -33,7 +33,11 @@ Use '%' to match all file paths or as a wildcard (e.g. '%.go' for all .go files)
 		if ui, err = blame.NewTermUI(pathPattern); err != nil {
 			handleExitError(err)
 		}
-		defer ui.Close()
+		defer func() {
+			if err := ui.Close(); err != nil {
+				handleExitError(err)
+			}
+		}()
 
 		if blameOutputJSON {
 			fmt.Println(ui.PrintJSON())

diff --git a/cmd/summarize_commits.go b/cmd/summarize_commits.go
@@ -41,7 +41,11 @@ Read more here: https://sqlite.org/lang_expr.html#the_like_glob_regexp_and_match
 		if ui, err = commits.NewTermUI(pathPattern, summarizeDateFilterStart, summarizeDateFilterEnd); err != nil {
 			handleExitError(err)
 		}
-		defer ui.Close()
+		defer func() {
+			if err := ui.Close(); err != nil {
+				handleExitError(err)
+			}
+		}()
 
 		if summarizeOutputJSON {
 			fmt.Println(ui.PrintJSON())