MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-08 21:24:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

A better way to print prettified json syntax error msg

Browse Source
This commit is contained in:
Anis ELLEUCH
2015-09-29 23:11:46 +01:00
committed by Harshavardhana
parent db293aedb7
commit b5ea05d839
14 changed files with 432 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/quick/quick.go
View File

@@ -19,6 +19,7 @@
package quick
import (
"bytes"
"encoding/json"
"fmt"
"io/ioutil"
@@ -144,7 +145,12 @@ func Load(filename string, data interface{}) (Config, *probe.Error) {
err = json.Unmarshal(fileData, &data)
if err != nil {
return nil, probe.NewError(err)
switch err := err.(type) {
case *json.SyntaxError:
return nil, probe.NewError(FormatJSONSyntaxError(bytes.NewReader(fileData), err))
default:
return nil, probe.NewError(err)
}
}
config, perr := New(data)
@@ -182,7 +188,12 @@ func (d *config) Load(filename string) *probe.Error {
err = json.Unmarshal(fileData, d.data)
if err != nil {
return probe.NewError(err)
switch err := err.(type) {
case *json.SyntaxError:
return probe.NewError(FormatJSONSyntaxError(bytes.NewReader(fileData), err))
default:
return probe.NewError(err)
}
}
if err := CheckData(d.data); err != nil {