all: blidly swap out glog to our log15, logs need rework
This commit is contained in:
@@ -30,8 +30,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/davecgh/go-spew/spew"
|
||||
"github.com/ethereum/go-ethereum/logger"
|
||||
"github.com/ethereum/go-ethereum/logger/glog"
|
||||
"github.com/ethereum/go-ethereum/log"
|
||||
"golang.org/x/net/context"
|
||||
)
|
||||
|
||||
@@ -147,10 +146,6 @@ func testClientCancel(transport string, t *testing.T) {
|
||||
// You probably want to run with -parallel 1 or comment out
|
||||
// the call to t.Parallel if you enable the logging.
|
||||
t.Parallel()
|
||||
// glog.SetV(6)
|
||||
// glog.SetToStderr(true)
|
||||
// defer glog.SetToStderr(false)
|
||||
// glog.Infoln("testing ", transport)
|
||||
|
||||
// The actual test starts here.
|
||||
var (
|
||||
@@ -181,7 +176,7 @@ func testClientCancel(transport string, t *testing.T) {
|
||||
// The key thing here is that no call will ever complete successfully.
|
||||
err := client.CallContext(ctx, nil, "service_sleep", 2*maxContextCancelTimeout)
|
||||
if err != nil {
|
||||
glog.V(logger.Debug).Infoln("got expected error:", err)
|
||||
log.Debug(fmt.Sprint("got expected error:", err))
|
||||
} else {
|
||||
t.Errorf("no error for call with %v wait time", timeout)
|
||||
}
|
||||
@@ -532,7 +527,7 @@ func (l *flakeyListener) Accept() (net.Conn, error) {
|
||||
if err == nil {
|
||||
timeout := time.Duration(rand.Int63n(int64(l.maxKillTimeout)))
|
||||
time.AfterFunc(timeout, func() {
|
||||
glog.V(logger.Debug).Infof("killing conn %v after %v", c.LocalAddr(), timeout)
|
||||
log.Debug(fmt.Sprintf("killing conn %v after %v", c.LocalAddr(), timeout))
|
||||
c.Close()
|
||||
})
|
||||
}
|
||||
|
Reference in New Issue
Block a user