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
4df2df33
Unverified
Commit
4df2df33
authored
Dec 04, 2020
by
Rinke Hendriksen
Committed by
GitHub
Dec 04, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove "error" from log messages (#1042)
parent
0b337f6b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
kademlia.go
pkg/kademlia/kademlia.go
+5
-5
libp2p.go
pkg/p2p/libp2p/libp2p.go
+1
-1
pricing.go
pkg/pricing/pricing.go
+2
-2
puller.go
pkg/puller/puller.go
+2
-2
No files found.
pkg/kademlia/kademlia.go
View file @
4df2df33
...
@@ -176,8 +176,8 @@ func (k *Kad) manage() {
...
@@ -176,8 +176,8 @@ func (k *Kad) manage() {
k
.
logger
.
Debugf
(
"could not remove peer from addressbook: %s"
,
peer
.
String
())
k
.
logger
.
Debugf
(
"could not remove peer from addressbook: %s"
,
peer
.
String
())
}
}
}
}
k
.
logger
.
Debugf
(
"
error connecting
to peer from kademlia %s: %v"
,
bzzAddr
.
String
(),
err
)
k
.
logger
.
Debugf
(
"
could not connect
to peer from kademlia %s: %v"
,
bzzAddr
.
String
(),
err
)
k
.
logger
.
Warningf
(
"co
nnecting to peer %s: %v"
,
bzzAddr
.
ShortString
(),
err
)
k
.
logger
.
Warningf
(
"co
uld not connect to peer"
)
// continue to next
// continue to next
return
false
,
false
,
nil
return
false
,
false
,
nil
}
}
...
@@ -339,7 +339,7 @@ func (k *Kad) connect(ctx context.Context, peer swarm.Address, ma ma.Multiaddr,
...
@@ -339,7 +339,7 @@ func (k *Kad) connect(ctx context.Context, peer swarm.Address, ma ma.Multiaddr,
return
nil
return
nil
}
}
k
.
logger
.
Debugf
(
"
error connecting
to peer %s: %v"
,
peer
,
err
)
k
.
logger
.
Debugf
(
"
could not connect
to peer %s: %v"
,
peer
,
err
)
retryTime
:=
time
.
Now
()
.
Add
(
timeToRetry
)
retryTime
:=
time
.
Now
()
.
Add
(
timeToRetry
)
var
e
*
p2p
.
ConnectionBackoffError
var
e
*
p2p
.
ConnectionBackoffError
k
.
waitNextMu
.
Lock
()
k
.
waitNextMu
.
Lock
()
...
@@ -399,7 +399,7 @@ func (k *Kad) announce(ctx context.Context, peer swarm.Address) error {
...
@@ -399,7 +399,7 @@ func (k *Kad) announce(ctx context.Context, peer swarm.Address) error {
go
func
(
connectedPeer
swarm
.
Address
)
{
go
func
(
connectedPeer
swarm
.
Address
)
{
defer
k
.
wg
.
Done
()
defer
k
.
wg
.
Done
()
if
err
:=
k
.
discovery
.
BroadcastPeers
(
context
.
Background
(),
connectedPeer
,
peer
);
err
!=
nil
{
if
err
:=
k
.
discovery
.
BroadcastPeers
(
context
.
Background
(),
connectedPeer
,
peer
);
err
!=
nil
{
k
.
logger
.
Debugf
(
"
error gossiping
peer %s to peer %s: %v"
,
peer
,
connectedPeer
,
err
)
k
.
logger
.
Debugf
(
"
could not gossip
peer %s to peer %s: %v"
,
peer
,
connectedPeer
,
err
)
}
}
}(
connectedPeer
)
}(
connectedPeer
)
...
@@ -729,7 +729,7 @@ func (k *Kad) marshal(indent bool) ([]byte, error) {
...
@@ -729,7 +729,7 @@ func (k *Kad) marshal(indent bool) ([]byte, error) {
func
(
k
*
Kad
)
String
()
string
{
func
(
k
*
Kad
)
String
()
string
{
b
,
err
:=
k
.
marshal
(
true
)
b
,
err
:=
k
.
marshal
(
true
)
if
err
!=
nil
{
if
err
!=
nil
{
k
.
logger
.
Errorf
(
"
error marshaling
kademlia into json: %v"
,
err
)
k
.
logger
.
Errorf
(
"
could not marshal
kademlia into json: %v"
,
err
)
return
""
return
""
}
}
return
string
(
b
)
return
string
(
b
)
...
...
pkg/p2p/libp2p/libp2p.go
View file @
4df2df33
...
@@ -378,7 +378,7 @@ func (s *Service) AddProtocol(p p2p.ProtocolSpec) (err error) {
...
@@ -378,7 +378,7 @@ func (s *Service) AddProtocol(p p2p.ProtocolSpec) (err error) {
_
=
s
.
Disconnect
(
overlay
)
_
=
s
.
Disconnect
(
overlay
)
}
}
logger
.
Debugf
(
"
error
handle protocol %s/%s: stream %s: peer %s: error: %v"
,
p
.
Name
,
p
.
Version
,
ss
.
Name
,
overlay
,
err
)
logger
.
Debugf
(
"
could not
handle protocol %s/%s: stream %s: peer %s: error: %v"
,
p
.
Name
,
p
.
Version
,
ss
.
Name
,
overlay
,
err
)
return
return
}
}
})
})
...
...
pkg/pricing/pricing.go
View file @
4df2df33
...
@@ -76,7 +76,7 @@ func (s *Service) handler(ctx context.Context, p p2p.Peer, stream p2p.Stream) (e
...
@@ -76,7 +76,7 @@ func (s *Service) handler(ctx context.Context, p p2p.Peer, stream p2p.Stream) (e
var
req
pb
.
AnnouncePaymentThreshold
var
req
pb
.
AnnouncePaymentThreshold
if
err
:=
r
.
ReadMsgWithContext
(
ctx
,
&
req
);
err
!=
nil
{
if
err
:=
r
.
ReadMsgWithContext
(
ctx
,
&
req
);
err
!=
nil
{
s
.
logger
.
Debugf
(
"
error receiving
payment threshold announcement from peer %v"
,
p
.
Address
)
s
.
logger
.
Debugf
(
"
could not receive
payment threshold announcement from peer %v"
,
p
.
Address
)
return
fmt
.
Errorf
(
"read request from peer %v: %w"
,
p
.
Address
,
err
)
return
fmt
.
Errorf
(
"read request from peer %v: %w"
,
p
.
Address
,
err
)
}
}
s
.
logger
.
Tracef
(
"received payment threshold announcement from peer %v of %d"
,
p
.
Address
,
req
.
PaymentThreshold
)
s
.
logger
.
Tracef
(
"received payment threshold announcement from peer %v of %d"
,
p
.
Address
,
req
.
PaymentThreshold
)
...
@@ -87,7 +87,7 @@ func (s *Service) handler(ctx context.Context, p p2p.Peer, stream p2p.Stream) (e
...
@@ -87,7 +87,7 @@ func (s *Service) handler(ctx context.Context, p p2p.Peer, stream p2p.Stream) (e
func
(
s
*
Service
)
init
(
ctx
context
.
Context
,
p
p2p
.
Peer
)
error
{
func
(
s
*
Service
)
init
(
ctx
context
.
Context
,
p
p2p
.
Peer
)
error
{
err
:=
s
.
AnnouncePaymentThreshold
(
ctx
,
p
.
Address
,
s
.
paymentThreshold
)
err
:=
s
.
AnnouncePaymentThreshold
(
ctx
,
p
.
Address
,
s
.
paymentThreshold
)
if
err
!=
nil
{
if
err
!=
nil
{
s
.
logger
.
Warningf
(
"
error sending
payment threshold announcement to peer %v"
,
p
.
Address
)
s
.
logger
.
Warningf
(
"
could not send
payment threshold announcement to peer %v"
,
p
.
Address
)
}
}
return
err
return
err
}
}
...
...
pkg/puller/puller.go
View file @
4df2df33
...
@@ -274,7 +274,7 @@ func (p *Puller) syncPeer(ctx context.Context, peer swarm.Address, po, d uint8)
...
@@ -274,7 +274,7 @@ func (p *Puller) syncPeer(ctx context.Context, peer swarm.Address, po, d uint8)
cursors
,
err
:=
p
.
syncer
.
GetCursors
(
ctx
,
peer
)
cursors
,
err
:=
p
.
syncer
.
GetCursors
(
ctx
,
peer
)
if
err
!=
nil
{
if
err
!=
nil
{
if
logMore
{
if
logMore
{
p
.
logger
.
Debugf
(
"
error getting
cursors from peer %s: %v"
,
peer
.
String
(),
err
)
p
.
logger
.
Debugf
(
"
could not get
cursors from peer %s: %v"
,
peer
.
String
(),
err
)
}
}
delete
(
p
.
syncPeers
[
po
],
peer
.
String
())
delete
(
p
.
syncPeers
[
po
],
peer
.
String
())
return
return
...
@@ -366,7 +366,7 @@ func (p *Puller) histSyncWorker(ctx context.Context, peer swarm.Address, bin uin
...
@@ -366,7 +366,7 @@ func (p *Puller) histSyncWorker(ctx context.Context, peer swarm.Address, bin uin
err
=
p
.
addPeerInterval
(
peer
,
bin
,
s
,
top
)
err
=
p
.
addPeerInterval
(
peer
,
bin
,
s
,
top
)
if
err
!=
nil
{
if
err
!=
nil
{
p
.
metrics
.
HistWorkerErrCounter
.
Inc
()
p
.
metrics
.
HistWorkerErrCounter
.
Inc
()
p
.
logger
.
Errorf
(
"
error persisting interval for peer, quitting"
)
p
.
logger
.
Errorf
(
"
could not persist interval for peer %s, quitting"
,
peer
)
return
return
}
}
}
}
...
...
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