From 63de65be45b0feabc6a19c30317d997faee045d6 Mon Sep 17 00:00:00 2001 From: Noah Hsu Date: Thu, 18 May 2023 23:32:05 +0800 Subject: [PATCH] fix: increase timeout for http_client (close #4409) --- drivers/base/client.go | 2 +- internal/fs/util.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/base/client.go b/drivers/base/client.go index 82f62433..d46377b1 100644 --- a/drivers/base/client.go +++ b/drivers/base/client.go @@ -40,7 +40,7 @@ func NewRestyClient() *resty.Client { func NewHttpClient() *http.Client { return &http.Client{ - Timeout: DefaultTimeout, + Timeout: time.Hour * 48, Transport: &http.Transport{ TLSClientConfig: &tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify}, }, diff --git a/internal/fs/util.go b/internal/fs/util.go index ca3cb48f..a8af9614 100644 --- a/internal/fs/util.go +++ b/internal/fs/util.go @@ -8,11 +8,11 @@ import ( stdpath "path" "strings" - "github.com/alist-org/alist/v3/drivers/base" "github.com/alist-org/alist/v3/internal/conf" "github.com/alist-org/alist/v3/internal/model" "github.com/alist-org/alist/v3/internal/op" "github.com/alist-org/alist/v3/pkg/utils" + "github.com/alist-org/alist/v3/server/common" "github.com/google/uuid" "github.com/pkg/errors" ) @@ -59,7 +59,7 @@ func getFileStreamFromLink(file model.Obj, link *model.Link) (*model.FileStream, for h, val := range link.Header { req.Header[h] = val } - res, err := base.HttpClient.Do(req) + res, err := common.HttpClient().Do(req) if err != nil { return nil, errors.Wrapf(err, "failed to get response for %s", link.URL) }