opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-09-09 17:22:21 +08:00
Code Issues Projects Releases Wiki Activity

Replace ctxgroup.ContextGroup -> goprocess.Process

Browse Source 
License: MIT
Signed-off-by: rht <rhtbot@gmail.com>
This commit is contained in:
rht
2015-06-17 19:18:52 +07:00
parent 5bfd694ca7
commit 330b213777
19 changed files with 72 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/core.go
View File

@ -17,9 +17,10 @@ import (
"time"
b58 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
ctxgroup "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
goprocess "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
goprocessctx "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/context"
mamask "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/whyrusleeping/multiaddr-filter"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
diag "github.com/ipfs/go-ipfs/diagnostics"
@ -105,7 +106,7 @@ type IpfsNode struct {
IpnsFs *ipnsfs.Filesystem
ctxgroup.ContextGroup
goprocess.Process
mode mode
}
@ -121,12 +122,12 @@ type Mounts struct {
type ConfigOption func(ctx context.Context) (*IpfsNode, error)
func NewIPFSNode(parent context.Context, option ConfigOption) (*IpfsNode, error) {
ctxg := ctxgroup.WithContext(parent)
ctx := ctxg.Context()
procctx := goprocessctx.WithContext(parent)
ctx := parent
success := false // flip to true after all sub-system inits succeed
defer func() {
if !success {
ctxg.Close()
procctx.Close()
}
}()
@ -134,7 +135,7 @@ func NewIPFSNode(parent context.Context, option ConfigOption) (*IpfsNode, error)
if err != nil {
return nil, err
}
node.ContextGroup = ctxg
node.Process = procctx
ctxg.SetTeardown(node.teardown)
// Need to make sure it's perfectly clear 1) which variables are expected