|
@@ -306,6 +306,8 @@ func UploadCommand(conn *websocket.Conn,absolutePath,fileName,projectName,dir st |
|
|
defer tfile.Close() |
|
|
defer tfile.Close() |
|
|
|
|
|
|
|
|
serverSh := shell.NewShell(config.ServerIpfsUrl) |
|
|
serverSh := shell.NewShell(config.ServerIpfsUrl) |
|
|
|
|
|
serverSh.SetTimeout(time.Duration(30)*time.Second) |
|
|
|
|
|
log.Println("检测引导节点存活情况"+config.ServerIpfsUrl) |
|
|
//检测引导节点是否连接成功 |
|
|
//检测引导节点是否连接成功 |
|
|
isUp := serverSh.IsUp() |
|
|
isUp := serverSh.IsUp() |
|
|
if !isUp { |
|
|
if !isUp { |
|
@@ -318,6 +320,7 @@ func UploadCommand(conn *websocket.Conn,absolutePath,fileName,projectName,dir st |
|
|
|
|
|
|
|
|
var uploading bool=false |
|
|
var uploading bool=false |
|
|
|
|
|
|
|
|
|
|
|
log.Println("本地执行ipfs add") |
|
|
cmd := exec.Command(ipfsPath, "add",absolutePath) |
|
|
cmd := exec.Command(ipfsPath, "add",absolutePath) |
|
|
uploadProgress := make(chan string,10000) |
|
|
uploadProgress := make(chan string,10000) |
|
|
var stdout, stderr []byte |
|
|
var stdout, stderr []byte |
|
@@ -414,6 +417,7 @@ func UploadCommand(conn *websocket.Conn,absolutePath,fileName,projectName,dir st |
|
|
prog.Process=100.00 |
|
|
prog.Process=100.00 |
|
|
|
|
|
|
|
|
sh := shell.NewShell(config.GobalIpfsUrl) |
|
|
sh := shell.NewShell(config.GobalIpfsUrl) |
|
|
|
|
|
sh.SetTimeout(time.Duration(30)*time.Second) |
|
|
objectStat,err :=sh.ObjectStat(prog.Hash) |
|
|
objectStat,err :=sh.ObjectStat(prog.Hash) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
log.Println(err) |
|
|
log.Println(err) |
|
@@ -422,7 +426,7 @@ func UploadCommand(conn *websocket.Conn,absolutePath,fileName,projectName,dir st |
|
|
prog.Size=strconv.Itoa(objectStat.CumulativeSize) |
|
|
prog.Size=strconv.Itoa(objectStat.CumulativeSize) |
|
|
|
|
|
|
|
|
projson,err :=json.Marshal(prog) |
|
|
projson,err :=json.Marshal(prog) |
|
|
|
|
|
|
|
|
|
|
|
serverSh.SetTimeout(time.Duration(30)*time.Second) |
|
|
err = serverSh.Pin(prog.Hash) |
|
|
err = serverSh.Pin(prog.Hash) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
log.Println("引导节点备份失败") |
|
|
log.Println("引导节点备份失败") |
|
|