Unverified Commit f0fffd9a authored by Steven Allen's avatar Steven Allen Committed by GitHub

Merge pull request #65 from libp2p/fix/remove-deprecated-logging

remove deprecated log.Warning(f)
parents 57c272b5 deded72e
This diff is collapsed.
...@@ -195,7 +195,7 @@ func (mp *Multiplex) handleOutgoing() { ...@@ -195,7 +195,7 @@ func (mp *Multiplex) handleOutgoing() {
err := mp.writeMsg(data) err := mp.writeMsg(data)
if err != nil { if err != nil {
// the connection is closed by this time // the connection is closed by this time
log.Warningf("error writing data: %s", err.Error()) log.Warnf("error writing data: %s", err.Error())
return return
} }
} }
...@@ -482,7 +482,7 @@ func (mp *Multiplex) handleIncoming() { ...@@ -482,7 +482,7 @@ func (mp *Multiplex) handleIncoming() {
// closed stream, return b // closed stream, return b
pool.Put(b) pool.Put(b)
log.Warningf("Received data from remote after stream was closed by them. (len = %d)", len(b)) log.Warnf("Received data from remote after stream was closed by them. (len = %d)", len(b))
// go mp.sendResetMsg(msch.id.header(resetTag), false) // go mp.sendResetMsg(msch.id.header(resetTag), false)
continue continue
} }
...@@ -494,7 +494,7 @@ func (mp *Multiplex) handleIncoming() { ...@@ -494,7 +494,7 @@ func (mp *Multiplex) handleIncoming() {
pool.Put(b) pool.Put(b)
case <-recvTimeout.C: case <-recvTimeout.C:
pool.Put(b) pool.Put(b)
log.Warningf("timed out receiving message into stream queue.") log.Warnf("timed out receiving message into stream queue.")
// Do not do this asynchronously. Otherwise, we // Do not do this asynchronously. Otherwise, we
// could drop a message, then receive a message, // could drop a message, then receive a message,
// then reset. // then reset.
...@@ -532,7 +532,7 @@ func (mp *Multiplex) sendResetMsg(header uint64, hard bool) { ...@@ -532,7 +532,7 @@ func (mp *Multiplex) sendResetMsg(header uint64, hard bool) {
err := mp.sendMsg(ctx.Done(), header, nil) err := mp.sendMsg(ctx.Done(), header, nil)
if err != nil && !mp.isShutdown() { if err != nil && !mp.isShutdown() {
if hard { if hard {
log.Warningf("error sending reset message: %s; killing connection", err.Error()) log.Warnf("error sending reset message: %s; killing connection", err.Error())
mp.Close() mp.Close()
} else { } else {
log.Debugf("error sending reset message: %s", err.Error()) log.Debugf("error sending reset message: %s", err.Error())
......
...@@ -206,7 +206,7 @@ func (s *Stream) Close() error { ...@@ -206,7 +206,7 @@ func (s *Stream) Close() error {
} }
if err != nil && !s.mp.isShutdown() { if err != nil && !s.mp.isShutdown() {
log.Warningf("Error closing stream: %s; killing connection", err.Error()) log.Warnf("Error closing stream: %s; killing connection", err.Error())
s.mp.Close() s.mp.Close()
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment