Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove deprecated log.Warning(f) #144

Merged
merged 2 commits into from
Aug 19, 2020
Merged

remove deprecated log.Warning(f) #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
221abff
remove deprecated log.Warning(f)
lanzafame Oct 29, 2019
216e2b8
switch to structured logging
Stebalien Aug 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (d *Daemon) connectBootstrapPeers(pis []*pstore.PeerInfo, toconnect int) in
}
err := d.host.Connect(ctx, *pi)
if err != nil {
log.Debugf("Error connecting to bootstrap peer %s: %s", pi.ID, err.Error())
log.Debugw("Error connecting to bootstrap peer", "peer", pi.ID, "error", err)
} else {
d.host.ConnManager().TagPeer(pi.ID, "bootstrap", 1)
count++
Expand Down
46 changes: 23 additions & 23 deletions conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,35 +30,35 @@ func (d *Daemon) handleConn(c net.Conn) {
err := r.ReadMsg(&req)
if err != nil {
if err != io.EOF {
log.Debugf("Error reading message: %s", err.Error())
log.Debugw("error reading message", "error", err)
}
return
}

log.Debugf("request: %d [%s]", *req.Type, req.Type.String())
log.Debugw("request", "type", req.GetType())

switch *req.Type {
switch req.GetType() {
case pb.Request_IDENTIFY:
res := d.doIdentify(&req)
err := w.WriteMsg(res)
if err != nil {
log.Debugf("Error writing response: %s", err.Error())
log.Debugw("error writing response", "error", err)
return
}

case pb.Request_CONNECT:
res := d.doConnect(&req)
err := w.WriteMsg(res)
if err != nil {
log.Debugf("Error writing response: %s", err.Error())
log.Debugw("error writing response", "error", err)
return
}

case pb.Request_STREAM_OPEN:
res, s := d.doStreamOpen(&req)
err := w.WriteMsg(res)
if err != nil {
log.Debugf("Error writing response: %s", err.Error())
log.Debugw("error writing response", "error", err)
if s != nil {
s.Reset()
}
Expand All @@ -74,15 +74,15 @@ func (d *Daemon) handleConn(c net.Conn) {
res := d.doStreamHandler(&req)
err := w.WriteMsg(res)
if err != nil {
log.Debugf("Error writing response: %s", err.Error())
log.Debugw("error writing response", "error", err)
return
}

case pb.Request_DHT:
res, ch, cancel := d.doDHT(&req)
err := w.WriteMsg(res)
if err != nil {
log.Debugf("Error writing response: %s", err.Error())
log.Debugw("error writing response", "error", err)
if ch != nil {
cancel()
}
Expand All @@ -93,15 +93,15 @@ func (d *Daemon) handleConn(c net.Conn) {
for res := range ch {
err = w.WriteMsg(res)
if err != nil {
log.Debugf("Error writing response: %s", err.Error())
log.Debugw("error writing response", "error", err)
cancel()
return
}
}

err = w.WriteMsg(dhtResponseEnd())
if err != nil {
log.Debugf("Error writing response: %s", err.Error())
log.Debugw("error writing response", "error", err)
return
}
}
Expand All @@ -110,31 +110,31 @@ func (d *Daemon) handleConn(c net.Conn) {
res := d.doListPeers(&req)
err := w.WriteMsg(res)
if err != nil {
log.Debugf("Error writing response: %s", err.Error())
log.Debugw("error writing response", "error", err)
return
}

case pb.Request_CONNMANAGER:
res := d.doConnManager(&req)
err := w.WriteMsg(res)
if err != nil {
log.Debugf("Error writing response: %s", err.Error())
log.Debugw("error writing response", "error", err)
return
}

case pb.Request_DISCONNECT:
res := d.doDisconnect(&req)
err := w.WriteMsg(res)
if err != nil {
log.Debugf("Error writing response: %s", err.Error())
log.Debugw("error writing response", "error", err)
return
}

case pb.Request_PUBSUB:
res, sub := d.doPubsub(&req)
err := w.WriteMsg(res)
if err != nil {
log.Debugf("Error writing response: %s", err.Error())
log.Debugw("error writing response", "error", err)
if sub != nil {
sub.Cancel()
}
Expand All @@ -147,7 +147,7 @@ func (d *Daemon) handleConn(c net.Conn) {
}

default:
log.Debugf("Unexpected request type: %d", *req.Type)
log.Debugw("unexpected request type", "type", req.GetType())
return
}
}
Expand Down Expand Up @@ -176,7 +176,7 @@ func (d *Daemon) doConnect(req *pb.Request) *pb.Response {

pid, err := peer.IDFromBytes(req.Connect.Peer)
if err != nil {
log.Debugf("Error parsing peer ID: %s", err.Error())
log.Debugw("error parsing peer ID", "error", err)
return errorResponse(err)
}

Expand All @@ -185,18 +185,18 @@ func (d *Daemon) doConnect(req *pb.Request) *pb.Response {
for x, bs := range req.Connect.Addrs {
addr, err := ma.NewMultiaddrBytes(bs)
if err != nil {
log.Debugf("Error parsing multiaddr: %s", err.Error())
log.Debugw("Error parsing multiaddr", "error", err)
return errorResponse(err)
}
addrs[x] = addr
}

pi := peer.AddrInfo{ID: pid, Addrs: addrs}

log.Debugf("connecting to %s", pid.Pretty())
log.Debug("connecting", "to", pid)
err = d.host.Connect(ctx, pi)
if err != nil {
log.Debugf("error opening connection to %s: %s", pid.Pretty(), err.Error())
log.Debugw("error opening connection", "to", pid, "error", err)
return errorResponse(err)
}

Expand Down Expand Up @@ -231,7 +231,7 @@ func (d *Daemon) doStreamOpen(req *pb.Request) (*pb.Response, network.Stream) {

pid, err := peer.IDFromBytes(req.StreamOpen.Peer)
if err != nil {
log.Debugf("Error parsing peer ID: %s", err.Error())
log.Debugw("Error parsing peer ID", "error", err)
return errorResponse(err), nil
}

Expand All @@ -240,10 +240,10 @@ func (d *Daemon) doStreamOpen(req *pb.Request) (*pb.Response, network.Stream) {
protos[x] = protocol.ID(str)
}

log.Debugf("opening stream to %s", pid.Pretty())
log.Debugf("opening stream", "to", pid)
s, err := d.host.NewStream(ctx, pid, protos...)
if err != nil {
log.Debugf("Error opening stream to %s: %s", pid.Pretty(), err.Error())
log.Debugw("error opening stream", "to", pid, "error", err)
return errorResponse(err), nil
}

Expand All @@ -270,7 +270,7 @@ func (d *Daemon) doStreamHandler(req *pb.Request) *pb.Response {
if !ok {
d.host.SetStreamHandler(p, d.handleStream)
}
log.Debugf("set stream handler: %s -> %s", sp, maddr.String())
log.Debugw("set stream handler", "protocol", sp, "to", maddr)
d.handlers[p] = maddr
}

Expand Down
4 changes: 2 additions & 2 deletions connmgr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ func (d *Daemon) doConnManager(req *pb.Request) *pb.Response {
return errorResponseString("Malformed request; missing parameters")
}

switch *req.ConnManager.Type {
switch req.ConnManager.GetType() {
case pb.ConnManagerRequest_TAG_PEER:
p, err := peer.IDFromBytes(req.ConnManager.GetPeer())
if err != nil {
Expand Down Expand Up @@ -52,7 +52,7 @@ func (d *Daemon) doConnManager(req *pb.Request) *pb.Response {
return okResponse()

default:
log.Debugf("Unexpected ConnManager request type: %d", *req.ConnManager.Type)
log.Debugf("unexpected ConnManager request type", "type", req.ConnManager.GetType())
return errorResponseString("Unexpected request")
}
}
2 changes: 1 addition & 1 deletion daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ func (d *Daemon) listen() {

c, err := d.listener.Accept()
if err != nil {
log.Errorf("error accepting connection: %s", err.Error())
log.Errorw("error accepting connection", "error", err)
continue
}

Expand Down
4 changes: 2 additions & 2 deletions dht.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func (d *Daemon) doDHT(req *pb.Request) (*pb.Response, <-chan *pb.DHTResponse, f
return errorResponseString("Malformed request; missing parameters"), nil, nil
}

switch *req.Dht.Type {
switch req.Dht.GetType() {
case pb.DHTRequest_FIND_PEER:
return d.doDHTFindPeer(req.Dht)

Expand Down Expand Up @@ -51,7 +51,7 @@ func (d *Daemon) doDHT(req *pb.Request) (*pb.Response, <-chan *pb.DHTResponse, f
return d.doDHTProvide(req.Dht)

default:
log.Debugf("Unexpected DHT request type: %d", *req.Dht.Type)
log.Debugw("unexpected DHT request type", "type", req.Dht.GetType())
return errorResponseString("Unexpected request"), nil, nil
}
}
Expand Down
22 changes: 22 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,12 @@ github.com/ipfs/go-log/v2 v2.0.5 h1:fL4YI+1g5V/b1Yxr1qAiXTMg1H8z9vx/VmJxBuQMHvU=
github.com/ipfs/go-log/v2 v2.0.5/go.mod h1:eZs4Xt4ZUJQFM3DlanGhy7TkwwawCZcSByscwkWG+dw=
github.com/ipfs/go-log/v2 v2.1.1 h1:G4TtqN+V9y9HY9TA6BwbCVyyBZ2B9MbCjR2MtGx8FR0=
github.com/ipfs/go-log/v2 v2.1.1/go.mod h1:2v2nsGfZsvvAJz13SyFzf9ObaqwHiHxsPLEHntrv9KM=
github.com/ipfs/go-log v0.0.2-0.20190920042044-a609c1ae5144 h1:5WM8S1nwquWQ3zEuNhK82NE5Di6Pd41qz9JxxvxTAIA=
github.com/ipfs/go-log v0.0.2-0.20190920042044-a609c1ae5144/go.mod h1:azGN5dH7ailfREknDDNYB0Eq4qZ/4I4Y3gO0ivjJNyM=
github.com/ipfs/go-todocounter v0.0.1 h1:kITWA5ZcQZfrUnDNkRn04Xzh0YFaDFXsoO2A81Eb6Lw=
github.com/ipfs/go-todocounter v0.0.1/go.mod h1:l5aErvQc8qKE2r7NDMjmq5UNAvuZy0rC8BHOplkWvZ4=
github.com/jackpal/gateway v1.0.5 h1:qzXWUJfuMdlLMtt0a3Dgt+xkWQiA5itDEITVJtuSwMc=
github.com/jackpal/gateway v1.0.5 h1:qzXWUJfuMdlLMtt0a3Dgt+xkWQiA5itDEITVJtuSwMc=
github.com/jackpal/gateway v1.0.5/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA=
github.com/jackpal/go-nat-pmp v1.0.1/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
Expand Down Expand Up @@ -572,10 +578,14 @@ github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
Expand Down Expand Up @@ -683,22 +693,34 @@ go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
go.uber.org/goleak v1.0.0 h1:qsup4IcBdlmsnGfqyLl4Ntn3C2XCCuKAE7DwHpScyUo=
go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A=
go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4=
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM=
go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
Expand Down
8 changes: 4 additions & 4 deletions p2pclient/dht.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func convertPbPeerInfo(pbi *pb.PeerInfo) (PeerInfo, error) {
for _, addrbytes := range pbi.Addrs {
addr, err := ma.NewMultiaddrBytes(addrbytes)
if err != nil {
log.Errorf("error parsing multiaddr in peerinfo: %s", err)
log.Errorw("error parsing multiaddr in peerinfo", "error", err)
continue
}
addrs = append(addrs, addr)
Expand Down Expand Up @@ -83,7 +83,7 @@ func readDhtResponseStream(ctx context.Context, control net.Conn) (<-chan *pb.DH
default:
msg := &pb.DHTResponse{}
if err := r.ReadMsg(msg); err != nil {
log.Errorf("reading daemon response: %s", err)
log.Errorw("reading daemon response", "error", err)
return
}

Expand Down Expand Up @@ -226,7 +226,7 @@ func convertResponseToPeerInfo(respc <-chan *pb.DHTResponse) <-chan PeerInfo {
for resp := range respc {
info, err := convertPbPeerInfo(resp.GetPeer())
if err != nil {
log.Errorf("error converting peerinfo: %s", err.Error())
log.Errorw("error converting peerinfo", "error", err)
continue
}

Expand All @@ -246,7 +246,7 @@ func convertResponseToPeerID(respc <-chan *pb.DHTResponse) <-chan peer.ID {
for resp := range respc {
id, err := peer.IDFromBytes(resp.GetValue())
if err != nil {
log.Errorf("error parsing peer id: %s", err.Error())
log.Errorw("error parsing peer id", "error", err)
continue
}

Expand Down
2 changes: 1 addition & 1 deletion p2pclient/pubsub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (c *Client) streamPubsubRequest(ctx context.Context, psReq *pb.PSRequest) (
for {
msg := &pb.PSMessage{}
if err := r.ReadMsg(msg); err != nil {
log.Errorf("reading pubsub message: %s", err)
log.Errorw("reading pubsub message", "error", err)
return
}
out <- msg
Expand Down
6 changes: 3 additions & 3 deletions p2pclient/streams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,21 +136,21 @@ func (c *Client) streamDispatcher() {
for {
rawconn, err := c.listener.Accept()
if err != nil {
log.Warningf("accepting incoming connection: %s", err)
log.Warnw("accepting incoming connection", "error", err)
return
}
conn := &byteReaderConn{rawconn}

info := &pb.StreamInfo{}
err = readMsgSafe(conn, info)
if err != nil {
log.Errorf("error reading stream info: %s", err)
log.Errorw("error reading stream info", "error", err)
conn.Close()
continue
}
streamInfo, err := convertStreamInfo(info)
if err != nil {
log.Errorf("error parsing stream info: %s", err)
log.Errorw("error parsing stream info", "error", err)
conn.Close()
continue
}
Expand Down
Loading