opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-28 00:39:31 +08:00
Code Issues Projects Releases Wiki Activity

refac(core): expose core.OnlineWithRouting constructor option

Browse Source 
fix FIXUP maybeRouter in core
This commit is contained in:
Brian Tiger Chow
2015-01-26 15:57:20 -08:00
parent 41d6d040b8
commit 1beef957da
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/core.go
View File

@ -144,12 +144,24 @@ func Offline(r repo.Repo) ConfigOption {
return Standard(r, false) return Standard(r, false)
} }
func OnlineWithRouting(r repo.Repo, router routing.IpfsRouting) ConfigOption {
if router == nil {
panic("router required")
}
return standardWithRouting(r, true, router)
}
func Online(r repo.Repo) ConfigOption { func Online(r repo.Repo) ConfigOption {
return Standard(r, true) return Standard(r, true)
} }
// DEPRECATED: use Online, Offline functions // DEPRECATED: use Online, Offline functions
func Standard(r repo.Repo, online bool) ConfigOption { func Standard(r repo.Repo, online bool) ConfigOption {
return standardWithRouting(r, online, nil)
}
// TODO refactor so maybeRouter isn't special-cased in this way
func standardWithRouting(r repo.Repo, online bool, maybeRouter routing.IpfsRouting) ConfigOption {
return func(ctx context.Context) (n *IpfsNode, err error) { return func(ctx context.Context) (n *IpfsNode, err error) {
// FIXME perform node construction in the main constructor so it isn't // FIXME perform node construction in the main constructor so it isn't
// necessary to perform this teardown in this scope. // necessary to perform this teardown in this scope.
@ -191,7 +203,7 @@ func Standard(r repo.Repo, online bool) ConfigOption {
} }
if online { if online {
if err := n.StartOnlineServices(ctx); err != nil { if err := n.StartOnlineServices(ctx, maybeRouter); err != nil {
return nil, err return nil, err
} }
} else { } else {
@ -203,7 +215,7 @@ func Standard(r repo.Repo, online bool) ConfigOption {
} }
} }
func (n *IpfsNode) StartOnlineServices(ctx context.Context) error { func (n *IpfsNode) StartOnlineServices(ctx context.Context, maybeRouter routing.IpfsRouting) error {
if n.PeerHost != nil { // already online. if n.PeerHost != nil { // already online.
return debugerror.New("node already online") return debugerror.New("node already online")
@ -220,7 +232,7 @@ func (n *IpfsNode) StartOnlineServices(ctx context.Context) error {
} }
n.PeerHost = peerhost n.PeerHost = peerhost
if err := n.startOnlineServicesWithHost(ctx); err != nil { if err := n.startOnlineServicesWithHost(ctx, maybeRouter); err != nil {
return err return err
} }
@ -237,16 +249,20 @@ func (n *IpfsNode) StartOnlineServices(ctx context.Context) error {
// startOnlineServicesWithHost is the set of services which need to be // startOnlineServicesWithHost is the set of services which need to be
// initialized with the host and _before_ we start listening. // initialized with the host and _before_ we start listening.
func (n *IpfsNode) startOnlineServicesWithHost(ctx context.Context) error { func (n *IpfsNode) startOnlineServicesWithHost(ctx context.Context, maybeRouter routing.IpfsRouting) error {
// setup diagnostics service // setup diagnostics service
n.Diagnostics = diag.NewDiagnostics(n.Identity, n.PeerHost) n.Diagnostics = diag.NewDiagnostics(n.Identity, n.PeerHost)
// setup routing service // setup routing service
if maybeRouter != nil {
n.Routing = maybeRouter
} else {
dhtRouting, err := constructDHTRouting(ctx, n.PeerHost, n.Repo.Datastore()) dhtRouting, err := constructDHTRouting(ctx, n.PeerHost, n.Repo.Datastore())
if err != nil { if err != nil {
return debugerror.Wrap(err) return debugerror.Wrap(err)
} }
n.Routing = dhtRouting n.Routing = dhtRouting
}
// setup exchange service // setup exchange service
const alwaysSendToPeer = true // use YesManStrategy const alwaysSendToPeer = true // use YesManStrategy