Merge pull request #7 from bk2204/backend-error-handling

bk2204 · web-flow · commit fe8fbf7de1cd · 2018-11-15T18:08:37.000Z
backend: improve error handling
diff --git a/backend.go b/backend.go
@@ -41,6 +41,7 @@ func findAllBackends(mainLoose *fileStorer, mainPacked *pack.Storage, root strin
 		}
 		return nil, err
 	}
+	defer f.Close()
 
 	scanner := bufio.NewScanner(f)
 	for scanner.Scan() {
@@ -51,6 +52,11 @@ func findAllBackends(mainLoose *fileStorer, mainPacked *pack.Storage, root strin
 		}
 		storage = append(storage, pack)
 	}
+
+	if err := scanner.Err(); err != nil {
+		return nil, err
+	}
+
 	return storage, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ func findAllBackends(mainLoose fileStorer, mainPacked pack.Storage, root strin`
`41`	`41`	`}`
`42`	`42`	`return nil, err`
`43`	`43`	`}`
	`44`	`+ defer f.Close()`
`44`	`45`
`45`	`46`	`scanner := bufio.NewScanner(f)`
`46`	`47`	`for scanner.Scan() {`
`@@ -51,6 +52,11 @@ func findAllBackends(mainLoose fileStorer, mainPacked pack.Storage, root strin`
`51`	`52`	`}`
`52`	`53`	`storage = append(storage, pack)`
`53`	`54`	`}`
	`55`	`+`
	`56`	`+ if err := scanner.Err(); err != nil {`
	`57`	`+ return nil, err`
	`58`	`+ }`
	`59`	`+`
`54`	`60`	`return storage, nil`
`55`	`61`	`}`
`56`	`62`