From af4c6360ff1e46c41316005b678652186e7e0a8f Mon Sep 17 00:00:00 2001 From: godcong Date: Wed, 23 Sep 2020 16:16:01 +0800 Subject: [PATCH 1/3] fix #132 --- util/utils.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/util/utils.go b/util/utils.go index 2ec1a80..34ff4f1 100644 --- a/util/utils.go +++ b/util/utils.go @@ -28,7 +28,8 @@ var ( return os.Remove(path) } - InsideGUI = func() bool { return false } + InsideGUI = func() bool { return false } + ShellTimeOut = 30 * time.Minute ) func init() { @@ -98,17 +99,15 @@ func Fetch(ipfspath string) (io.ReadCloser, error) { ep, err := ApiEndpoint(IpfsDir()) if err == nil { sh := api.NewShell(ep) + sh.SetTimeout(ShellTimeOut) if sh.IsUp() { stump.VLog(" - using local ipfs daemon for transfer") rc, err := sh.Cat(ipfspath) - if err != nil { - return nil, err + if err == nil { + return newLimitReadCloser(rc, fetchSizeLimit), nil } - - return newLimitReadCloser(rc, fetchSizeLimit), nil } } - return httpFetch(GlobalGatewayUrl + ipfspath) } From d26686e93071b424d127da65edbf5f9205661b3f Mon Sep 17 00:00:00 2001 From: godcong Date: Fri, 23 Oct 2020 13:28:46 +0800 Subject: [PATCH 2/3] fix #132 quoting the suggestion of sigma67 --- util/utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/utils.go b/util/utils.go index 34ff4f1..230692e 100644 --- a/util/utils.go +++ b/util/utils.go @@ -29,7 +29,7 @@ var ( } InsideGUI = func() bool { return false } - ShellTimeOut = 30 * time.Minute + ShellTimeOut = 3 * time.Minute ) func init() { From aa5fad36e55b1c126481e3bd764213445780fc57 Mon Sep 17 00:00:00 2001 From: godcong Date: Tue, 27 Oct 2020 12:43:28 +0800 Subject: [PATCH 3/3] fix #132 quoting the suggestion of Stebalien change timeout 3m -> 5m --- util/utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/utils.go b/util/utils.go index 230692e..58427d8 100644 --- a/util/utils.go +++ b/util/utils.go @@ -29,7 +29,7 @@ var ( } InsideGUI = func() bool { return false } - ShellTimeOut = 3 * time.Minute + ShellTimeOut = 5 * time.Minute ) func init() {