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
ccdf8043
Unverified
Commit
ccdf8043
authored
Jun 24, 2020
by
Petar Radovic
Committed by
GitHub
Jun 24, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
error -> trace in connect calls (#363)
parent
89e665e3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
kademlia.go
pkg/kademlia/kademlia.go
+1
-1
node.go
pkg/node/node.go
+6
-6
No files found.
pkg/kademlia/kademlia.go
View file @
ccdf8043
...
@@ -150,7 +150,7 @@ func (k *Kad) manage() {
...
@@ -150,7 +150,7 @@ func (k *Kad) manage() {
err
=
k
.
connect
(
ctx
,
peer
,
bzzAddr
.
Underlay
,
po
)
err
=
k
.
connect
(
ctx
,
peer
,
bzzAddr
.
Underlay
,
po
)
if
err
!=
nil
{
if
err
!=
nil
{
k
.
logger
.
Debugf
(
"error connecting to peer from kademlia %s: %v"
,
bzzAddr
.
String
(),
err
)
k
.
logger
.
Debugf
(
"error connecting to peer from kademlia %s: %v"
,
bzzAddr
.
String
(),
err
)
k
.
logger
.
Error
f
(
"connecting to peer %s: %v"
,
bzzAddr
.
ShortString
(),
err
)
k
.
logger
.
Warning
f
(
"connecting to peer %s: %v"
,
bzzAddr
.
ShortString
(),
err
)
// continue to next
// continue to next
return
false
,
false
,
nil
return
false
,
false
,
nil
}
}
...
...
pkg/node/node.go
View file @
ccdf8043
...
@@ -381,7 +381,7 @@ func NewBee(o Options) (*Bee, error) {
...
@@ -381,7 +381,7 @@ func NewBee(o Options) (*Bee, error) {
defer
wg
.
Done
()
defer
wg
.
Done
()
if
err
:=
topologyDriver
.
AddPeer
(
p2pCtx
,
overlay
);
err
!=
nil
{
if
err
:=
topologyDriver
.
AddPeer
(
p2pCtx
,
overlay
);
err
!=
nil
{
logger
.
Debugf
(
"topology add peer fail %s: %v"
,
overlay
,
err
)
logger
.
Debugf
(
"topology add peer fail %s: %v"
,
overlay
,
err
)
logger
.
Error
f
(
"topology add peer %s"
,
overlay
)
logger
.
Warning
f
(
"topology add peer %s"
,
overlay
)
return
return
}
}
...
@@ -400,7 +400,7 @@ func NewBee(o Options) (*Bee, error) {
...
@@ -400,7 +400,7 @@ func NewBee(o Options) (*Bee, error) {
addr
,
err
:=
ma
.
NewMultiaddr
(
a
)
addr
,
err
:=
ma
.
NewMultiaddr
(
a
)
if
err
!=
nil
{
if
err
!=
nil
{
logger
.
Debugf
(
"multiaddress fail %s: %v"
,
a
,
err
)
logger
.
Debugf
(
"multiaddress fail %s: %v"
,
a
,
err
)
logger
.
Error
f
(
"connect to bootnode %s"
,
a
)
logger
.
Warning
f
(
"connect to bootnode %s"
,
a
)
return
return
}
}
var
count
int
var
count
int
...
@@ -410,7 +410,7 @@ func NewBee(o Options) (*Bee, error) {
...
@@ -410,7 +410,7 @@ func NewBee(o Options) (*Bee, error) {
if
err
!=
nil
{
if
err
!=
nil
{
if
!
errors
.
Is
(
err
,
p2p
.
ErrAlreadyConnected
)
{
if
!
errors
.
Is
(
err
,
p2p
.
ErrAlreadyConnected
)
{
logger
.
Debugf
(
"connect fail %s: %v"
,
addr
,
err
)
logger
.
Debugf
(
"connect fail %s: %v"
,
addr
,
err
)
logger
.
Error
f
(
"connect to bootnode %s"
,
addr
)
logger
.
Warning
f
(
"connect to bootnode %s"
,
addr
)
}
}
return
false
,
nil
return
false
,
nil
}
}
...
@@ -420,14 +420,14 @@ func NewBee(o Options) (*Bee, error) {
...
@@ -420,14 +420,14 @@ func NewBee(o Options) (*Bee, error) {
if
err
!=
nil
{
if
err
!=
nil
{
_
=
p2ps
.
Disconnect
(
bzzAddr
.
Overlay
)
_
=
p2ps
.
Disconnect
(
bzzAddr
.
Overlay
)
logger
.
Debugf
(
"addressbook error persisting %s %s: %v"
,
addr
,
bzzAddr
.
Overlay
,
err
)
logger
.
Debugf
(
"addressbook error persisting %s %s: %v"
,
addr
,
bzzAddr
.
Overlay
,
err
)
logger
.
Error
f
(
"connect to bootnode %s"
,
addr
)
logger
.
Warning
f
(
"connect to bootnode %s"
,
addr
)
return
false
,
nil
return
false
,
nil
}
}
if
err
:=
topologyDriver
.
Connected
(
p2pCtx
,
bzzAddr
.
Overlay
);
err
!=
nil
{
if
err
:=
topologyDriver
.
Connected
(
p2pCtx
,
bzzAddr
.
Overlay
);
err
!=
nil
{
_
=
p2ps
.
Disconnect
(
bzzAddr
.
Overlay
)
_
=
p2ps
.
Disconnect
(
bzzAddr
.
Overlay
)
logger
.
Debugf
(
"topology connected fail %s %s: %v"
,
addr
,
bzzAddr
.
Overlay
,
err
)
logger
.
Debugf
(
"topology connected fail %s %s: %v"
,
addr
,
bzzAddr
.
Overlay
,
err
)
logger
.
Error
f
(
"connect to bootnode %s"
,
addr
)
logger
.
Warning
f
(
"connect to bootnode %s"
,
addr
)
return
false
,
nil
return
false
,
nil
}
}
count
++
count
++
...
@@ -435,7 +435,7 @@ func NewBee(o Options) (*Bee, error) {
...
@@ -435,7 +435,7 @@ func NewBee(o Options) (*Bee, error) {
return
count
>
3
,
nil
return
count
>
3
,
nil
});
err
!=
nil
{
});
err
!=
nil
{
logger
.
Debugf
(
"discover fail %s: %v"
,
a
,
err
)
logger
.
Debugf
(
"discover fail %s: %v"
,
a
,
err
)
logger
.
Error
f
(
"discover to bootnode %s"
,
a
)
logger
.
Warning
f
(
"discover to bootnode %s"
,
a
)
return
return
}
}
}(
a
)
}(
a
)
...
...
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