added configurable refresh rate to boot

pravahio · Aug 23, 2019 · d58537a · d58537a
1 parent 7822288
commit d58537a
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 11 deletions.
diff --git a/cmd/utils/boot.go b/cmd/utils/boot.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	mrand "math/rand"
 	"strconv"
+	"time"
 
 	logging "github.com/ipfs/go-log"
 	crypto "github.com/libp2p/go-libp2p-core/crypto"
@@ -16,8 +17,9 @@ import (
 )
 
 const (
-	BOOT_RNZ = "/BOOT_RNZ"
-	PORT     = "4000"
+	BOOT_RNZ     = "/BOOT_RNZ"
+	PORT         = "4000"
+	REFRESH_RATE = 15 * time.Minute
 )
 
 var (
@@ -178,7 +180,7 @@ func boot(k crypto.PrivKey) {
 		return
 	}
 
-	bservice := bs.NewBootstrapService(false, BOOT_RNZ, cfg.BootstrapList)
+	bservice := bs.NewBootstrapService(false, BOOT_RNZ, cfg.BootstrapList, REFRESH_RATE)
 	app.InjectService(bservice)
 
 	err = app.Start()

diff --git a/config/config.go b/config/config.go
@@ -3,6 +3,7 @@ package config
 import (
 	"crypto/ecdsa"
 	"crypto/x509"
+	"time"
 
 	logging "github.com/ipfs/go-log"
 	crypto "github.com/libp2p/go-libp2p-core/crypto"
@@ -20,8 +21,9 @@ type Config struct {
 	AccountCert   *x509.Certificate
 
 	// Bootstrap
-	BootstrapNodes      []string
-	BootstrapRendezvous string
+	BootstrapNodes       []string
+	BootstrapRendezvous  string
+	BootstrapRefreshRate time.Duration
 
 	// Remote Access
 	RemoteAccessURI        string // TODO: what about the contract address?????

diff --git a/config/const.go b/config/const.go
@@ -1,10 +1,13 @@
 package config
 
+import "time"
+
 var (
 	BootstrapList = []string{
 		"/ip4/13.234.78.241/udp/4000/quic/p2p/QmVbcMycaK8ni5CeiM7JRjBRAdmwky6dQ6KcoxLesZDPk9",
 	}
-	remoteURI = ""
-	RpcURI    = "127.0.0.1:"
-	RpcPort   = 5555
+	remoteURI            = ""
+	RpcURI               = "127.0.0.1:"
+	RpcPort              = 5555
+	BootstrapRefreshRate = 15 * time.Second
 )
diff --git a/config/defaults.go b/config/defaults.go
@@ -35,6 +35,12 @@ var DefaultBootstrapRendezvous = func(cfg *Config) error {
 	return nil
 }
 
+// DefaultBootstrapRefreshRate specifies time interval to look for new peer nodes
+var DefaultBootstrapRefreshRate = func(cfg *Config) error {
+	cfg.BootstrapRefreshRate = BootstrapRefreshRate
+	return nil
+}
+
 // DefaultRemoteAccessURI defines a remote point URL which is used for authentication of data topics, publishers and subscribers.
 // It can be a central server or a blockchain service.
 // It should support interface defined in 'interface/blockchain/blockchain.go'
@@ -87,6 +93,10 @@ var Defaults = []struct {
 		Fallback: func(cfg *Config) bool { return cfg.BootstrapRendezvous == "" },
 		Opt:      DefaultBootstrapRendezvous,
 	},
+	{
+		Fallback: func(cfg *Config) bool { return cfg.BootstrapRefreshRate == 0 },
+		Opt:      DefaultBootstrapRefreshRate,
+	},
 	{
 		Fallback: func(cfg *Config) bool { return cfg.RemoteAccessURI == "" },
 		Opt:      DefaultRemoteAccessURI,

diff --git a/mesh/mesh_client.go b/mesh/mesh_client.go
@@ -54,7 +54,7 @@ func NewMesh(ctx context.Context, opt ...config.Option) (*Mesh, error) {
 		return nil, err
 	}
 
-	bservice := bs.NewBootstrapService(false, cfg.BootstrapRendezvous, cfg.BootstrapNodes)
+	bservice := bs.NewBootstrapService(false, cfg.BootstrapRendezvous, cfg.BootstrapNodes, cfg.BootstrapRefreshRate)
 	app.InjectService(bservice)
 
 	f := fpubsub.NewFilter(ethDriver)

diff --git a/service/bootstrap/bootstrap.go b/service/bootstrap/bootstrap.go
@@ -2,6 +2,7 @@ package bootstrap
 
 import (
 	"context"
+	"time"
 
 	logging "github.com/ipfs/go-log"
 	inet "github.com/libp2p/go-libp2p-core/network"
@@ -33,16 +34,20 @@ type BootstrapService struct {
 	ctxLocal           context.Context
 	ctxLocalCancelFunc context.CancelFunc
 
+	// refresh rate
+	d time.Duration
+
 	s inet.Stream
 }
 
 // NewBootstrapService creates a new BootstrapService.
-func NewBootstrapService(ann bool, rPoint string, bList []string) *BootstrapService {
+func NewBootstrapService(ann bool, rPoint string, bList []string, d time.Duration) *BootstrapService {
 	hs := &BootstrapService{
 		announce:        ann,
 		rendezvousPoint: rPoint,
 		bootstrapPeers:  bList,
 		readyChanList:   make([]chan interface{}, 0),
+		d:               d,
 	}
 
 	hs.SetNameVersion(NAME, VERSION)

diff --git a/service/bootstrap/connection.go b/service/bootstrap/connection.go
@@ -75,7 +75,7 @@ func (bs *BootstrapService) announceAndFind() error {
 	discovery.Advertise(bs.ctxLocal, routingDiscovery, bs.rendezvousPoint)
 	log.Debug("Successfully announced!")
 
-	ticker := time.NewTicker(15 * time.Second)
+	ticker := time.NewTicker(bs.d)
 
 	for {
 		log.Debug("Searching for other peers...")