config: Fix some slices being appended the same values twice
trusted_peers and peer_addresses were appended the same info twice when reparsing the config. Once when parsing json and once when re-parsing with env-vars.
This commit is contained in:
parent
7824dfb4e3
commit
7e0d39cdf7
|
@ -439,15 +439,16 @@ func (cfg *Config) applyConfigJSON(jcfg *configJSON) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
// PeerAddresses
|
// PeerAddresses
|
||||||
|
peerAddrs := []ma.Multiaddr{}
|
||||||
for _, addr := range jcfg.PeerAddresses {
|
for _, addr := range jcfg.PeerAddresses {
|
||||||
peerAddr, err := ma.NewMultiaddr(addr)
|
peerAddr, err := ma.NewMultiaddr(addr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
err = fmt.Errorf("error parsing peer_addresses: %s", err)
|
err = fmt.Errorf("error parsing peer_addresses: %s", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
cfg.PeerAddresses = append(cfg.PeerAddresses, peerAddr)
|
peerAddrs = append(peerAddrs, peerAddr)
|
||||||
}
|
}
|
||||||
|
cfg.PeerAddresses = peerAddrs
|
||||||
cfg.LeaveOnShutdown = jcfg.LeaveOnShutdown
|
cfg.LeaveOnShutdown = jcfg.LeaveOnShutdown
|
||||||
cfg.DisableRepinning = jcfg.DisableRepinning
|
cfg.DisableRepinning = jcfg.DisableRepinning
|
||||||
cfg.FollowerMode = jcfg.FollowerMode
|
cfg.FollowerMode = jcfg.FollowerMode
|
||||||
|
|
|
@ -108,6 +108,7 @@ func (cfg *Config) applyJSONConfig(jcfg *jsonConfig) error {
|
||||||
|
|
||||||
// Whenever we parse JSON, TrustAll is false unless an '*' peer exists
|
// Whenever we parse JSON, TrustAll is false unless an '*' peer exists
|
||||||
cfg.TrustAll = false
|
cfg.TrustAll = false
|
||||||
|
cfg.TrustedPeers = []peer.ID{}
|
||||||
|
|
||||||
for _, p := range jcfg.TrustedPeers {
|
for _, p := range jcfg.TrustedPeers {
|
||||||
if p == "*" {
|
if p == "*" {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user