akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Server: make maximum backoff configurable

Browse Source
This commit is contained in:
Igor Cota 2018-10-04 17:55:37 +02:00
parent 640fe2558b
commit 02442ecbae
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config.go
View File

@ -53,6 +53,7 @@ const (
defaultInactiveChanTimeout = 20 * time.Minute defaultInactiveChanTimeout = 20 * time.Minute
defaultMaxLogFiles = 3 defaultMaxLogFiles = 3
defaultMaxLogFileSize = 10 defaultMaxLogFileSize = 10
defaultMaxBackoff = time.Hour
defaultTorSOCKSPort = 9050 defaultTorSOCKSPort = 9050
defaultTorDNSHost = "soa.nodes.lightning.directory" defaultTorDNSHost = "soa.nodes.lightning.directory"
@ -194,8 +195,9 @@ type config struct {
RESTListeners []net.Addr RESTListeners []net.Addr
Listeners []net.Addr Listeners []net.Addr
ExternalIPs []net.Addr ExternalIPs []net.Addr
DisableListen bool `long:"nolisten" description:"Disable listening for incoming peer connections"` DisableListen bool `long:"nolisten" description:"Disable listening for incoming peer connections"`
NAT bool `long:"nat" description:"Toggle NAT traversal support (using either UPnP or NAT-PMP) to automatically advertise your external IP address to the network -- NOTE this does not support devices behind multiple NATs"` NAT bool `long:"nat" description:"Toggle NAT traversal support (using either UPnP or NAT-PMP) to automatically advertise your external IP address to the network -- NOTE this does not support devices behind multiple NATs"`
MaxBackoff time.Duration `long:"maxbackoff" description:"Longest backoff when reconnecting to persistent peers. Valid time units are {s, m, h}."`
DebugLevel string `short:"d" long:"debuglevel" description:"Logging level for all subsystems {trace, debug, info, warn, error, critical} -- You may also specify <subsystem>=<level>,<subsystem2>=<level>,... to set the log level for individual subsystems -- Use show to list available subsystems"` DebugLevel string `short:"d" long:"debuglevel" description:"Logging level for all subsystems {trace, debug, info, warn, error, critical} -- You may also specify <subsystem>=<level>,<subsystem2>=<level>,... to set the log level for individual subsystems -- Use show to list available subsystems"`
@ -298,6 +300,7 @@ func loadConfig() (*config, error) {
}, },
MaxPendingChannels: defaultMaxPendingChannels, MaxPendingChannels: defaultMaxPendingChannels,
NoSeedBackup: defaultNoSeedBackup, NoSeedBackup: defaultNoSeedBackup,
MaxBackoff: defaultMaxBackoff,
SubRPCServers: &subRPCServerConfigs{ SubRPCServers: &subRPCServerConfigs{
SignRPC: &signrpc.Config{}, SignRPC: &signrpc.Config{},
}, },

8
server.go
View File

@ -52,10 +52,6 @@ const (
// reconnecting to persistent peers. // reconnecting to persistent peers.
defaultBackoff = time.Second defaultBackoff = time.Second
// maximumBackoff is the largest backoff we will permit when
// reattempting connections to persistent peers.
maximumBackoff = time.Hour
// defaultStableConnDuration is a floor under which all reconnection // defaultStableConnDuration is a floor under which all reconnection
// attempts will apply exponential randomized backoff. Connections // attempts will apply exponential randomized backoff. Connections
// durations exceeding this value will be eligible to have their // durations exceeding this value will be eligible to have their
@ -2853,8 +2849,8 @@ func parseHexColor(colorStr string) (color.RGBA, error) {
func computeNextBackoff(currBackoff time.Duration) time.Duration { func computeNextBackoff(currBackoff time.Duration) time.Duration {
// Double the current backoff, truncating if it exceeds our maximum. // Double the current backoff, truncating if it exceeds our maximum.
nextBackoff := 2 * currBackoff nextBackoff := 2 * currBackoff
if nextBackoff > maximumBackoff { if nextBackoff > cfg.MaxBackoff {
nextBackoff = maximumBackoff nextBackoff = cfg.MaxBackoff
} }
// Using 1/10 of our duration as a margin, compute a random offset to // Using 1/10 of our duration as a margin, compute a random offset to