From 9a9339a13dc7f98f06675e375360bda9c873e220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Thu, 15 Oct 2015 15:48:44 +0300 Subject: [PATCH] 4 --- eth/downloader/downloader.go | 14 +++++++------- eth/downloader/downloader_test.go | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index c1a4b879b9..557141553d 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -234,21 +234,21 @@ func (d *Downloader) UnregisterPeer(id string) error { // Synchronise tries to sync up our local block chain with a remote peer, both // adding various sanity checks as well as wrapping it with various log entries. func (d *Downloader) Synchronise(id string, head common.Hash, td *big.Int) { - glog.V(logger.Detail).Infof("Attempting synchronisation: %v, head [%x…], TD %v", id, head[:4], td) + glog.V(logger.Info).Infof("Attempting synchronisation: %v, head [%x…], TD %v", id, head[:4], td) switch err := d.synchronise(id, head, td); err { case nil: - glog.V(logger.Detail).Infof("Synchronisation completed") + glog.V(logger.Info).Infof("Synchronisation completed") case errBusy: - glog.V(logger.Detail).Infof("Synchronisation already in progress") + glog.V(logger.Info).Infof("Synchronisation already in progress") case errTimeout, errBadPeer, errStallingPeer, errEmptyHashSet, errEmptyHeaderSet, errPeersUnavailable, errInvalidChain: - glog.V(logger.Debug).Infof("Removing peer %v: %v", id, err) + glog.V(logger.Info).Infof("Removing peer %v: %v", id, err) d.dropPeer(id) case errPendingQueue: - glog.V(logger.Debug).Infoln("Synchronisation aborted:", err) + glog.V(logger.Info).Infoln("Synchronisation aborted:", err) default: glog.V(logger.Warn).Infof("Synchronisation failed: %v", err) @@ -327,9 +327,9 @@ func (d *Downloader) syncWithPeer(p *peer, hash common.Hash, td *big.Int) (err e } }() - glog.V(logger.Debug).Infof("Synchronising with the network using: %s [eth/%d]", p.id, p.version) + glog.V(logger.Info).Infof("Synchronising with the network using: %s [eth/%d]", p.id, p.version) defer func(start time.Time) { - glog.V(logger.Debug).Infof("Synchronisation terminated after %v", time.Since(start)) + glog.V(logger.Info).Infof("Synchronisation terminated after %v", time.Since(start)) }(time.Now()) switch { diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index 2091034868..00e6689bc0 100644 --- a/eth/downloader/downloader_test.go +++ b/eth/downloader/downloader_test.go @@ -35,6 +35,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/event" + "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/trie" @@ -54,7 +55,7 @@ func init() { go io.Copy(buf, r) os.Stderr = w - glog.SetV(6) + glog.SetV(logger.InfoLevel) glog.SetToStderr(true) fmt.Println("3")