forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 09:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #449 from ethersphere/log_err_smoke_test

Browse source 
cmd/swarm: log error on upload
This commit is contained in:
Anton Evangelatov 2018-04-26 17:57:18 +02:00 committed by GitHub
commit 8e857ad4bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/swarm/swarm-smoke/upload_and_sync.go
View file

@ -42,11 +42,13 @@ func cliUploadAndSync(c *cli.Context) error {
hash, err := upload(f, endpoints[0]) hash, err := upload(f, endpoints[0])
if err != nil { if err != nil {
log.Error(err.Error())
return err return err
} }
fhash, err := digest(f) fhash, err := digest(f)
if err != nil { if err != nil {
log.Error(err.Error())
return err return err
} }

6
swarm/api/api.go
View file

@ -319,9 +319,9 @@ func (self *Api) Get(key storage.Key, path string) (reader *storage.LazyChunkRea
return return
} }
log.Trace("trie getting entry", "key", key, "path", path) log.Debug("trie getting entry", "key", key, "path", path)
entry, _ := trie.getEntry(path) entry, _ := trie.getEntry(path)
log.Trace("trie got entry", "key", key, "path", path) log.Debug("trie got entry", "key", key, "path", path, "entry.Hash", entry.Hash)
if entry != nil { if entry != nil {
// we want to be able to serve Mutable Resource Updates transparently using the bzz:// scheme // we want to be able to serve Mutable Resource Updates transparently using the bzz:// scheme
@ -343,7 +343,7 @@ func (self *Api) Get(key storage.Key, path string) (reader *storage.LazyChunkRea
return return
} else { } else {
mimeType = entry.ContentType mimeType = entry.ContentType
log.Trace("content lookup key", "key", key, "mimetype", mimeType) log.Debug("content lookup key", "key", key, "mimetype", mimeType)
reader, _ = self.dpa.Retrieve(key) reader, _ = self.dpa.Retrieve(key)
} }
} else { } else {