mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-22 04:36:42 +00:00
sleep before launch swarm pull and no file written out
This commit is contained in:
parent
33126ae7a2
commit
31ed59d20b
1 changed files with 19 additions and 12 deletions
|
|
@ -4,9 +4,9 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net"
|
"net"
|
||||||
"os"
|
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/ethereum/go-ethereum/bzz"
|
"github.com/ethereum/go-ethereum/bzz"
|
||||||
"github.com/ethereum/go-ethereum/core"
|
"github.com/ethereum/go-ethereum/core"
|
||||||
|
|
@ -268,18 +268,25 @@ func (s *Ethereum) Start(seed bool, p string, pull string) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(pull) > 0 {
|
if len(pull) > 0 {
|
||||||
key := ethutil.Hex2Bytes(pull)
|
go func() {
|
||||||
reader := s.dpa.Retrieve(key)
|
time.Sleep(30 * time.Second)
|
||||||
logger.Debugf("retrieved reader for %064x", key)
|
key := ethutil.Hex2Bytes(pull)
|
||||||
fo, err := os.OpenFile("/tmp/swarm.tmp", os.O_CREATE|os.O_RDWR, 0666)
|
reader := s.dpa.Retrieve(key)
|
||||||
if err != nil {
|
logger.Debugf("retrieved reader for %064x", key)
|
||||||
logger.Warnf("file open error %v", err)
|
b := make([]byte, 0x1000)
|
||||||
} else {
|
var length int64
|
||||||
n, err := io.Copy(fo, reader)
|
for {
|
||||||
if err != nil && err != io.EOF {
|
n, err := reader.Read(b)
|
||||||
logger.Debugf("read %v bytes. read error for %064x: %v", n, key, err)
|
if err != nil {
|
||||||
|
if err != io.EOF {
|
||||||
|
logger.Debugf("read %v bytes. read error for %064x: %v", n, key, err)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
length += int64(n)
|
||||||
}
|
}
|
||||||
}
|
logger.Debugf("read %v bytes from %064x: %v", length, key)
|
||||||
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: read peers here
|
// TODO: read peers here
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue