Browse Source

Add better error handling

main
Sam 5 years ago
parent
commit
ca4ea152e9
  1. 4
      chat.go
  2. 8
      team.go

4
chat.go

@ -3,6 +3,7 @@ package keybase @@ -3,6 +3,7 @@ package keybase
import (
"bufio"
"encoding/json"
"errors"
"os/exec"
"strings"
"time"
@ -114,6 +115,9 @@ func chatAPIOut(keybasePath string, c ChatAPI) (ChatAPI, error) { @@ -114,6 +115,9 @@ func chatAPIOut(keybasePath string, c ChatAPI) (ChatAPI, error) {
if err := json.Unmarshal(cmdOut, &r); err != nil {
return ChatAPI{}, err
}
if r.Error != nil {
return ChatAPI{}, errors.New(r.Error.Message)
}
return r, nil
}

8
team.go

@ -2,6 +2,7 @@ package keybase @@ -2,6 +2,7 @@ package keybase
import (
"encoding/json"
"errors"
"fmt"
"os/exec"
)
@ -17,7 +18,12 @@ func teamAPIOut(keybasePath string, w TeamAPI) (TeamAPI, error) { @@ -17,7 +18,12 @@ func teamAPIOut(keybasePath string, w TeamAPI) (TeamAPI, error) {
}
var r TeamAPI
json.Unmarshal(cmdOut, &r)
if err := json.Unmarshal(cmdOut, &r); err != nil {
return TeamAPI{}, err
}
if r.Error != nil {
return TeamAPI{}, errors.New(r.Error.Message)
}
return r, nil
}

Loading…
Cancel
Save