mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-12 22:37:27 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #66 from prometheus/fix-meta-error-handling

Browse source 
Fix closing of meta file if meta encoding failed
This commit is contained in:
Fabian Reinartz 2017-04-28 16:06:42 +02:00 committed by GitHub
parent b07a87768a 94f1ac599e
commit 2c46815adb
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
block.go
View file

@ -137,8 +137,10 @@ func writeMetaFile(dir string, meta *BlockMeta) error {
enc := json.NewEncoder(f)
enc.SetIndent("", "\t")
if err := enc.Encode(&blockMeta{Version: 1, BlockMeta: meta}); err != nil {
return err
var merr MultiError
if merr.Add(enc.Encode(&blockMeta{Version: 1, BlockMeta: meta})); merr.Err() != nil {
merr.Add(f.Close())
return merr
}
if err := f.Close(); err != nil {
return err