Skip to content
Snippets Groups Projects
Commit 468cd4bd authored by Yawning Angel's avatar Yawning Angel
Browse files

Display a more useful error on JSON Unmarshall failure.

parent 83c9e3b9
No related branches found
No related tags found
No related merge requests found
......@@ -98,7 +98,8 @@ func serverStateFromJSONServerState(js *jsonServerState) (*obfs4ServerState, err
}
func jsonServerStateFromFile(stateDir string, js *jsonServerState) error {
f, err := ioutil.ReadFile(path.Join(stateDir, stateFile))
fPath := path.Join(stateDir, stateFile)
f, err := ioutil.ReadFile(fPath)
if err != nil {
if os.IsNotExist(err) {
if err = newJSONServerState(stateDir, js); err == nil {
......@@ -109,7 +110,7 @@ func jsonServerStateFromFile(stateDir string, js *jsonServerState) error {
}
if err = json.Unmarshal(f, js); err != nil {
return err
return fmt.Errorf("failed to load statefile '%s': %s", fPath, err)
}
return nil
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment