lfs/lfs: use lfsapi.Client.ConcurrentTransfers over config.ConcurrentTransfers()
This commit is contained in:
parent
ae667d3459
commit
7dbf33cc30
@ -10,6 +10,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/git-lfs/git-lfs/config"
|
"github.com/git-lfs/git-lfs/config"
|
||||||
|
"github.com/git-lfs/git-lfs/lfsapi"
|
||||||
"github.com/git-lfs/git-lfs/localstorage"
|
"github.com/git-lfs/git-lfs/localstorage"
|
||||||
"github.com/git-lfs/git-lfs/tools"
|
"github.com/git-lfs/git-lfs/tools"
|
||||||
"github.com/git-lfs/git-lfs/tq"
|
"github.com/git-lfs/git-lfs/tq"
|
||||||
@ -67,6 +68,12 @@ func Environ(cfg *config.Configuration, manifest *tq.Manifest) []string {
|
|||||||
osEnviron := os.Environ()
|
osEnviron := os.Environ()
|
||||||
env := make([]string, 0, len(osEnviron)+7)
|
env := make([]string, 0, len(osEnviron)+7)
|
||||||
|
|
||||||
|
api, err := lfsapi.NewClient(cfg.Os, cfg.Git)
|
||||||
|
if err != nil {
|
||||||
|
// TODO(@ttaylorr): don't panic
|
||||||
|
panic(err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
dltransfers := manifest.GetDownloadAdapterNames()
|
dltransfers := manifest.GetDownloadAdapterNames()
|
||||||
sort.Strings(dltransfers)
|
sort.Strings(dltransfers)
|
||||||
ultransfers := manifest.GetUploadAdapterNames()
|
ultransfers := manifest.GetUploadAdapterNames()
|
||||||
@ -81,7 +88,7 @@ func Environ(cfg *config.Configuration, manifest *tq.Manifest) []string {
|
|||||||
fmt.Sprintf("LocalMediaDir=%s", LocalMediaDir()),
|
fmt.Sprintf("LocalMediaDir=%s", LocalMediaDir()),
|
||||||
fmt.Sprintf("LocalReferenceDir=%s", config.LocalReferenceDir),
|
fmt.Sprintf("LocalReferenceDir=%s", config.LocalReferenceDir),
|
||||||
fmt.Sprintf("TempDir=%s", TempDir()),
|
fmt.Sprintf("TempDir=%s", TempDir()),
|
||||||
fmt.Sprintf("ConcurrentTransfers=%d", cfg.ConcurrentTransfers()),
|
fmt.Sprintf("ConcurrentTransfers=%d", api.ConcurrentTransfers),
|
||||||
fmt.Sprintf("TusTransfers=%v", cfg.TusTransfersAllowed()),
|
fmt.Sprintf("TusTransfers=%v", cfg.TusTransfersAllowed()),
|
||||||
fmt.Sprintf("BasicTransfersOnly=%v", cfg.BasicTransfersOnly()),
|
fmt.Sprintf("BasicTransfersOnly=%v", cfg.BasicTransfersOnly()),
|
||||||
fmt.Sprintf("SkipDownloadErrors=%v", cfg.SkipDownloadErrors()),
|
fmt.Sprintf("SkipDownloadErrors=%v", cfg.SkipDownloadErrors()),
|
||||||
|
@ -89,7 +89,7 @@ func NewClient(osEnv Env, gitEnv Env) (*Client, error) {
|
|||||||
DialTimeout: gitEnv.Int("lfs.dialtimeout", 0),
|
DialTimeout: gitEnv.Int("lfs.dialtimeout", 0),
|
||||||
KeepaliveTimeout: gitEnv.Int("lfs.keepalive", 0),
|
KeepaliveTimeout: gitEnv.Int("lfs.keepalive", 0),
|
||||||
TLSTimeout: gitEnv.Int("lfs.tlstimeout", 0),
|
TLSTimeout: gitEnv.Int("lfs.tlstimeout", 0),
|
||||||
ConcurrentTransfers: gitEnv.Int("lfs.concurrenttransfers", 0),
|
ConcurrentTransfers: gitEnv.Int("lfs.concurrenttransfers", 3),
|
||||||
SkipSSLVerify: !gitEnv.Bool("http.sslverify", true) || osEnv.Bool("GIT_SSL_NO_VERIFY", false),
|
SkipSSLVerify: !gitEnv.Bool("http.sslverify", true) || osEnv.Bool("GIT_SSL_NO_VERIFY", false),
|
||||||
Verbose: osEnv.Bool("GIT_CURL_VERBOSE", false),
|
Verbose: osEnv.Bool("GIT_CURL_VERBOSE", false),
|
||||||
DebuggingVerbose: osEnv.Bool("LFS_DEBUG_HTTP", false),
|
DebuggingVerbose: osEnv.Bool("LFS_DEBUG_HTTP", false),
|
||||||
|
Loading…
Reference in New Issue
Block a user