Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mybee
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
mybee
Commits
813afff6
Unverified
Commit
813afff6
authored
Jan 27, 2021
by
Rinke Hendriksen
Committed by
GitHub
Jan 27, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make logs more user friendly (#1145)
parent
de58bae5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
7 deletions
+9
-7
kademlia.go
pkg/kademlia/kademlia.go
+3
-4
handshake.go
pkg/p2p/libp2p/internal/handshake/handshake.go
+1
-1
libp2p.go
pkg/p2p/libp2p/libp2p.go
+5
-2
No files found.
pkg/kademlia/kademlia.go
View file @
813afff6
...
...
@@ -167,8 +167,6 @@ func (k *Kad) manage() {
return
false
,
false
,
err
}
k
.
logger
.
Debugf
(
"kademlia dialing to peer %s"
,
peer
.
String
())
err
=
k
.
connect
(
ctx
,
peer
,
bzzAddr
.
Underlay
,
po
)
if
err
!=
nil
{
if
errors
.
Is
(
err
,
errOverlayMismatch
)
{
...
...
@@ -177,8 +175,8 @@ func (k *Kad) manage() {
k
.
logger
.
Debugf
(
"could not remove peer from addressbook: %s"
,
peer
.
String
())
}
}
k
.
logger
.
Debugf
(
"
could not connect to peer
from kademlia %s: %v"
,
bzzAddr
.
String
(),
err
)
k
.
logger
.
Warningf
(
"
could not connect to peer
"
)
k
.
logger
.
Debugf
(
"
peer not reachable
from kademlia %s: %v"
,
bzzAddr
.
String
(),
err
)
k
.
logger
.
Warningf
(
"
peer not reachable when attempting to connect
"
)
// continue to next
return
false
,
false
,
nil
}
...
...
@@ -340,6 +338,7 @@ func recalcDepth(peers *pslice.PSlice) uint8 {
// connect connects to a peer and gossips its address to our connected peers,
// as well as sends the peers we are connected to to the newly connected peer
func
(
k
*
Kad
)
connect
(
ctx
context
.
Context
,
peer
swarm
.
Address
,
ma
ma
.
Multiaddr
,
po
uint8
)
error
{
k
.
logger
.
Infof
(
"attempting to connect to peer %s"
,
peer
)
ctx
,
cancel
:=
context
.
WithTimeout
(
ctx
,
5
*
time
.
Second
)
defer
cancel
()
i
,
err
:=
k
.
p2p
.
Connect
(
ctx
,
ma
)
...
...
pkg/p2p/libp2p/internal/handshake/handshake.go
View file @
813afff6
...
...
@@ -170,7 +170,7 @@ func (s *Service) Handshake(ctx context.Context, stream p2p.Stream, peerMultiadd
s
.
logger
.
Tracef
(
"handshake finished for peer (outbound) %s"
,
remoteBzzAddress
.
Overlay
.
String
())
if
len
(
resp
.
Ack
.
WelcomeMessage
)
>
0
{
s
.
logger
.
Infof
(
"greeting
<%s>
from peer: %s"
,
resp
.
Ack
.
WelcomeMessage
,
remoteBzzAddress
.
Overlay
.
String
())
s
.
logger
.
Infof
(
"greeting
\"
%s
\"
from peer: %s"
,
resp
.
Ack
.
WelcomeMessage
,
remoteBzzAddress
.
Overlay
.
String
())
}
return
&
Info
{
...
...
pkg/p2p/libp2p/libp2p.go
View file @
813afff6
...
...
@@ -304,7 +304,9 @@ func New(ctx context.Context, signer beecrypto.Signer, networkID uint64, overlay
}
s
.
metrics
.
HandledStreamCount
.
Inc
()
s
.
logger
.
Infof
(
"successfully connected to peer (inbound) %s"
,
i
.
BzzAddress
.
ShortString
())
s
.
logger
.
Debugf
(
"successfully connected to peer %s (inbound)"
,
i
.
BzzAddress
.
ShortString
())
s
.
logger
.
Infof
(
"successfully connected to peer %s (inbound)"
,
i
.
BzzAddress
.
Overlay
)
})
h
.
Network
()
.
SetConnHandler
(
func
(
_
network
.
Conn
)
{
...
...
@@ -531,7 +533,8 @@ func (s *Service) Connect(ctx context.Context, addr ma.Multiaddr) (address *bzz.
s
.
protocolsmu
.
RUnlock
()
s
.
metrics
.
CreatedConnectionCount
.
Inc
()
s
.
logger
.
Infof
(
"successfully connected to peer (outbound) %s"
,
i
.
BzzAddress
.
ShortString
())
s
.
logger
.
Debugf
(
"successfully connected to peer %s (outbound)"
,
i
.
BzzAddress
.
ShortString
())
s
.
logger
.
Infof
(
"successfully connected to peer %s (outbound)"
,
i
.
BzzAddress
.
Overlay
)
return
i
.
BzzAddress
,
nil
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment