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

Jump to bottom

report error source when failing to construct private network #4952

Merged
merged 3 commits into from
May 12, 2018
Merged

report error source when failing to construct private network #4952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c3c73d
cleanup swarm key open logic
Stebalien Apr 20, 2018
6cf42b5
report error source when failing to construct private network
Stebalien Apr 20, 2018
0aa9c0d
fix: format of pnet error message
Kubuxu May 9, 2018
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
2 changes: 1 addition & 1 deletion core/core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ func (n *IpfsNode) startOnlineServices(ctx context.Context, routingOption Routin
if swarmkey != nil {
protec, err = pnet.NewProtector(bytes.NewReader(swarmkey))
if err != nil {
return err
return fmt.Errorf("failed to configure private network: %s", err)
}
n.PNetFingerprint = protec.Fingerprint()
go func() {
Expand Down
8 changes: 2 additions & 6 deletions repo/fsrepo/fsrepo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,15 +701,11 @@ func (r *FSRepo) SwarmKey() ([]byte, error) {
f, err := os.Open(spath)
if err != nil {
if os.IsNotExist(err) {
return nil, nil
} else {
return nil, err
err = nil
}
}
defer f.Close()
if err != nil {
return nil, err
}
defer f.Close()

return ioutil.ReadAll(f)
}
Expand Down