coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-02-21 10:27:46 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #4952 from ipfs/fix/4951

Browse Source 
report error source when failing to construct private network
This commit is contained in:
Whyrusleeping 2018-05-12 13:18:20 +01:00 committed by GitHub
commit b3faaad131
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core.go
View File

@ -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() {

8
repo/fsrepo/fsrepo.go
View File

@ -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)
}