Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve errors a bit #86

Merged
merged 2 commits into from
Jul 26, 2019
Merged

improve errors a bit #86

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2facece
improve errors a bit
whyrusleeping Jul 26, 2019
12baee0
Use xerrors
magik6k Jul 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cli/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

logging "github.com/ipfs/go-log"
manet "github.com/multiformats/go-multiaddr-net"
"github.com/pkg/errors"
"gopkg.in/urfave/cli.v2"

"github.com/filecoin-project/go-lotus/api"
Expand All @@ -33,7 +34,7 @@ func GetAPI(ctx *cli.Context) (api.FullNode, error) {

ma, err := r.APIEndpoint()
if err != nil {
return nil, err
return nil, errors.Wrap(err, "failed to get api endpoint")
magik6k marked this conversation as resolved.
Show resolved Hide resolved
}
_, addr, err := manet.DialArgs(ma)
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions node/repo/fsrepo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ func (fsr *FsRepo) initKeystore() error {
// APIEndpoint returns endpoint of API in this repo
func (fsr *FsRepo) APIEndpoint() (multiaddr.Multiaddr, error) {
p := filepath.Join(fsr.path, fsAPI)
f, err := os.Open(p)

f, err := os.Open(p)
if os.IsNotExist(err) {
return nil, ErrNoAPIEndpoint
} else if err != nil {
Expand All @@ -115,7 +115,7 @@ func (fsr *FsRepo) APIEndpoint() (multiaddr.Multiaddr, error) {

data, err := ioutil.ReadAll(f)
if err != nil {
return nil, err
return nil, errors.Wrapf(err, "failed to read %q", p)
}
strma := string(data)
strma = strings.TrimSpace(strma)
Expand Down