diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-02-23 22:49:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-23 22:49:05 +0800 |
| commit | 357732a8404c9fe4d02f041d20a0d05381a3e6d1 (patch) | |
| tree | edaf8a63eb7f7434cd9b9cbd764b3c4c3d76191e /swarm/api/filesystem.go | |
| parent | 29fac7de448c85049a97cbec3dc0819122bd2cb0 (diff) | |
| parent | f89dd627760b43bd405cb3db1e5efdb100835db5 (diff) | |
| download | go-tangerine-357732a8404c9fe4d02f041d20a0d05381a3e6d1.tar go-tangerine-357732a8404c9fe4d02f041d20a0d05381a3e6d1.tar.gz go-tangerine-357732a8404c9fe4d02f041d20a0d05381a3e6d1.tar.bz2 go-tangerine-357732a8404c9fe4d02f041d20a0d05381a3e6d1.tar.lz go-tangerine-357732a8404c9fe4d02f041d20a0d05381a3e6d1.tar.xz go-tangerine-357732a8404c9fe4d02f041d20a0d05381a3e6d1.tar.zst go-tangerine-357732a8404c9fe4d02f041d20a0d05381a3e6d1.zip | |
Merge pull request #3696 from karalabe/contextual-logger
Contextual logger
Diffstat (limited to 'swarm/api/filesystem.go')
| -rw-r--r-- | swarm/api/filesystem.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/swarm/api/filesystem.go b/swarm/api/filesystem.go index 96aaf36df..c2583e265 100644 --- a/swarm/api/filesystem.go +++ b/swarm/api/filesystem.go @@ -26,8 +26,7 @@ import ( "sync" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/swarm/storage" ) @@ -63,7 +62,7 @@ func (self *FileSystem) Upload(lpath, index string) (string, error) { var start int if stat.IsDir() { start = len(localpath) - glog.V(logger.Debug).Infof("uploading '%s'", localpath) + log.Debug(fmt.Sprintf("uploading '%s'", localpath)) err = filepath.Walk(localpath, func(path string, info os.FileInfo, err error) error { if (err == nil) && !info.IsDir() { //fmt.Printf("lp %s path %s\n", localpath, path) @@ -198,7 +197,7 @@ func (self *FileSystem) Download(bzzpath, localpath string) error { quitC := make(chan bool) trie, err := loadManifest(self.api.dpa, key, quitC) if err != nil { - glog.V(logger.Warn).Infof("fs.Download: loadManifestTrie error: %v", err) + log.Warn(fmt.Sprintf("fs.Download: loadManifestTrie error: %v", err)) return err } @@ -212,7 +211,7 @@ func (self *FileSystem) Download(bzzpath, localpath string) error { prevPath := lpath err = trie.listWithPrefix(path, quitC, func(entry *manifestTrieEntry, suffix string) { - glog.V(logger.Detail).Infof("fs.Download: %#v", entry) + log.Trace(fmt.Sprintf("fs.Download: %#v", entry)) key = common.Hex2Bytes(entry.Hash) path := lpath + "/" + suffix |