JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SelfAddr -> ExternalAddress (#768)

Browse Source
This commit is contained in:
Dennis Coyle 2018-12-05 11:36:03 -05:00 committed by GitHub
parent c4033b15af
commit fffb093056
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/kademlia/config.go
View File

@ -49,11 +49,11 @@ type FarmerConfig struct {
// Config defines all of the things that are needed to start up Kademlia
// server endpoints (and not necessarily client code).
type Config struct {
BootstrapAddr string `help:"the kademlia node to bootstrap against" default:"bootstrap-dev.storj.io:8080"`
DBPath string `help:"the path for our db services to be created on" default:"$CONFDIR/kademlia"`
Alpha int `help:"alpha is a system wide concurrency parameter." default:"5"`
SelfAddr string `help:"the public address of the kademlia node; defaults to the gRPC server address." default:""`
Farmer FarmerConfig
BootstrapAddr string `help:"the kademlia node to bootstrap against" default:"bootstrap-dev.storj.io:8080"`
DBPath string `help:"the path for our db services to be created on" default:"$CONFDIR/kademlia"`
Alpha int `help:"alpha is a system wide concurrency parameter." default:"5"`
ExternalAddress string `help:"the public address of the kademlia node; defaults to the gRPC server address." default:""`
Farmer FarmerConfig
}
// Run implements provider.Responsibility
@ -76,8 +76,8 @@ func (c Config) Run(ctx context.Context, server *provider.Provider) (
nodeType := pb.NodeType_STORAGE // TODO: fix this for satellites
addr := server.Addr().String()
if c.SelfAddr != "" {
addr = c.SelfAddr
if c.ExternalAddress != "" {
addr = c.ExternalAddress
}
kad, err := NewKademlia(server.Identity().ID, nodeType, []pb.Node{*in}, addr, metadata, server.Identity(), c.DBPath, c.Alpha)