logos-messaging/logos-messaging-go
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-go.git synced 2026-05-28 14:19:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: increase timeout when dialing peers and add extra logging

Browse Source
This commit is contained in:
Richard Ramos 2022-08-25 20:18:03 -04:00
parent 2a55cbe5e6
commit e201528da7
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
waku/node.go
View File

@ -72,6 +72,8 @@ func freePort() (int, error) {
return port, nil return port, nil
} }
const dialTimeout = 7 * time.Second
// Execute starts a go-waku node with settings determined by the Options parameter // Execute starts a go-waku node with settings determined by the Options parameter
func Execute(options Options) { func Execute(options Options) {
if options.GenerateKey { if options.GenerateKey {
@ -228,7 +230,11 @@ func Execute(options Options) {
if err != nil { if err != nil {
logger.Warn("dns discovery error ", zap.Error(err)) logger.Warn("dns discovery error ", zap.Error(err))
} else { } else {
logger.Info("found dns entries ", zap.Any("qty", len(nodes))) var discAddresses []multiaddr.Multiaddr
for _, n := range nodes {
discAddresses = append(discAddresses, n.Addresses...)
}
logger.Info("found dns entries ", logging.MultiAddrs("nodes", discAddresses...))
discoveredNodes = nodes discoveredNodes = nodes
} }
} else { } else {
@ -290,23 +296,25 @@ func Execute(options Options) {
} }
for _, n := range options.StaticNodes { for _, n := range options.StaticNodes {
go func(node multiaddr.Multiaddr) { go func(ctx context.Context, node multiaddr.Multiaddr) {
ctx, cancel := context.WithTimeout(ctx, dialTimeout)
defer cancel()
err = wakuNode.DialPeerWithMultiAddress(ctx, node) err = wakuNode.DialPeerWithMultiAddress(ctx, node)
if err != nil { if err != nil {
logger.Error("dialing peer", zap.Error(err)) logger.Error("dialing peer", zap.Error(err))
} }
}(n) }(ctx, n)
} }
if len(discoveredNodes) != 0 { if len(discoveredNodes) != 0 {
for _, n := range discoveredNodes { for _, n := range discoveredNodes {
for _, m := range n.Addresses { for _, m := range n.Addresses {
go func(ctx context.Context, m multiaddr.Multiaddr) { go func(ctx context.Context, m multiaddr.Multiaddr) {
ctx, cancel := context.WithTimeout(ctx, time.Duration(3)*time.Second) ctx, cancel := context.WithTimeout(ctx, dialTimeout)
defer cancel() defer cancel()
err = wakuNode.DialPeerWithMultiAddress(ctx, m) err = wakuNode.DialPeerWithMultiAddress(ctx, m)
if err != nil { if err != nil {
logger.Error("dialing peer ", zap.Error(err)) logger.Error("dialing peer", logging.MultiAddrs("peer", m), zap.Error(err))
} }
}(ctx, m) }(ctx, m)
} }