fix updating peers limit if LES is enabled in CLI (#1199)

This commit is contained in:
Adam Babik 2018-09-19 20:29:42 +02:00 committed by GitHub
parent 99d7bc207d
commit fd99487328
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 19 deletions

View File

@ -69,10 +69,12 @@ func init() {
} }
func main() { func main() {
config, err := params.NewNodeConfigWithDefaults("statusd-data", params.FleetBeta, params.RopstenNetworkID) config, err := params.NewNodeConfigWithDefaultsAndFiles(
if err == nil { "statusd-data",
err = parseConfig(configFiles, config) params.FleetBeta,
} params.RopstenNetworkID,
configFiles...,
)
if err != nil { if err != nil {
printUsage() printUsage()
if err != nil { if err != nil {
@ -81,8 +83,17 @@ func main() {
os.Exit(1) os.Exit(1)
} }
if *logLevel != "" {
config.LogLevel = *logLevel
}
colors := !(*logWithoutColors) && terminal.IsTerminal(int(os.Stdin.Fd())) colors := !(*logWithoutColors) && terminal.IsTerminal(int(os.Stdin.Fd()))
if err = logutils.OverrideRootLog(logEnabled(config), config.LogLevel, config.LogFile, colors); err != nil { if err := logutils.OverrideRootLog(
logEnabled(config),
config.LogLevel,
config.LogFile,
colors,
); err != nil {
stdlog.Fatalf("Error initializing logger: %v", err) stdlog.Fatalf("Error initializing logger: %v", err)
} }
@ -204,19 +215,6 @@ func configureStatusService(flagValue string, nodeConfig *params.NodeConfig) (*p
return nodeConfig, nil return nodeConfig, nil
} }
func parseConfig(configFiles configFlags, config *params.NodeConfig) error {
// Merge specified configuration files, in order
if err := params.LoadConfigFromFiles(configFiles, config); err != nil {
return err
}
if *logLevel != "" {
config.LogLevel = *logLevel
}
return nil
}
// printVersion prints verbose output about version and config. // printVersion prints verbose output about version and config.
func printVersion(config *params.NodeConfig, buildStamp string) { func printVersion(config *params.NodeConfig, buildStamp string) {
fmt.Println(strings.Title(config.Name)) fmt.Println(strings.Title(config.Name))

View File

@ -274,7 +274,8 @@ type NodeConfig struct {
MailServerRegistryAddress string MailServerRegistryAddress string
} }
// NewNodeConfigWithDefaults creates new node configuration object with some defaults suitable for adhoc use // NewNodeConfigWithDefaults creates new node configuration object
// with some defaults suitable for adhoc use.
func NewNodeConfigWithDefaults(dataDir, fleet string, networkID uint64) (*NodeConfig, error) { func NewNodeConfigWithDefaults(dataDir, fleet string, networkID uint64) (*NodeConfig, error) {
nodeConfig, err := NewNodeConfig(dataDir, fleet, networkID) nodeConfig, err := NewNodeConfig(dataDir, fleet, networkID)
if err != nil { if err != nil {
@ -309,6 +310,27 @@ func NewNodeConfigWithDefaults(dataDir, fleet string, networkID uint64) (*NodeCo
return nodeConfig, nil return nodeConfig, nil
} }
// NewNodeConfigWithDefaultsAndFiles creates new node configuration object
// with some defaults suitable for adhoc use and applies config files on top.
func NewNodeConfigWithDefaultsAndFiles(
dataDir, fleet string, networkID uint64, files ...string,
) (*NodeConfig, error) {
c, err := NewNodeConfigWithDefaults(dataDir, fleet, networkID)
if err != nil {
return nil, err
}
for _, file := range files {
if err := loadConfigConfigFromFile(file, c); err != nil {
return nil, err
}
}
c.updatePeerLimits()
return c, nil
}
// updatePeerLimits will set default peer limits expectations based on enabled services. // updatePeerLimits will set default peer limits expectations based on enabled services.
func (c *NodeConfig) updatePeerLimits() { func (c *NodeConfig) updatePeerLimits() {
if c.NoDiscovery && !c.Rendezvous { if c.NoDiscovery && !c.Rendezvous {