diff options
| -rw-r--r-- | swarm/api/http/server.go | 12 | ||||
| -rw-r--r-- | swarm/network/depo.go | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go index afd867efc..b1cea60fc 100644 --- a/swarm/api/http/server.go +++ b/swarm/api/http/server.go @@ -293,13 +293,11 @@ func (self *sequentialReader) ReadAt(target []byte, off int64) (n int, err error self.lock.Lock() // assert self.pos <= off if self.pos > off { - glog.V(logger.Error).Infof("non-sequential read attempted from sequentialReader; %d > %d", - self.pos, off) + glog.V(logger.Error).Infof("non-sequential read attempted from sequentialReader; %d > %d", self.pos, off) panic("Non-sequential read attempt") } if self.pos != off { - glog.V(logger.Debug).Infof("deferred read in POST at position %d, offset %d.", - self.pos, off) + glog.V(logger.Debug).Infof("deferred read in POST at position %d, offset %d.", self.pos, off) wait := make(chan bool) self.ahead[off] = wait self.lock.Unlock() @@ -315,8 +313,7 @@ func (self *sequentialReader) ReadAt(target []byte, off int64) (n int, err error for localPos < len(target) { n, err = self.reader.Read(target[localPos:]) localPos += n - glog.V(logger.Debug).Infof("Read %d bytes into buffer size %d from POST, error %v.", - n, len(target), err) + glog.V(logger.Debug).Infof("Read %d bytes into buffer size %d from POST, error %v.", n, len(target), err) if err != nil { glog.V(logger.Debug).Infof("POST stream's reading terminated with %v.", err) for i := range self.ahead { @@ -330,8 +327,7 @@ func (self *sequentialReader) ReadAt(target []byte, off int64) (n int, err error } wait := self.ahead[self.pos] if wait != nil { - glog.V(logger.Debug).Infof("deferred read in POST at position %d triggered.", - self.pos) + glog.V(logger.Debug).Infof("deferred read in POST at position %d triggered.", self.pos) delete(self.ahead, self.pos) close(wait) } diff --git a/swarm/network/depo.go b/swarm/network/depo.go index 454a57270..cd0a17ffa 100644 --- a/swarm/network/depo.go +++ b/swarm/network/depo.go @@ -120,7 +120,7 @@ func (self *Depo) HandleStoreRequestMsg(req *storeRequestMsgData, p *peer) { islocal = true //return } - + hasher := self.hashfunc() hasher.Write(req.SData) if !bytes.Equal(hasher.Sum(nil), req.Key) { |