Commit 43dd782

committed

settings: add connection_timeout

1 parent 6dbff9f commit 43dd782Copy full SHA for 43dd782

File tree

-0

lines changed

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ func SetDefaults(settings *Settings) {`
`71`	`71`	`// network settings`
`72`	`72`	`setKeyTypeSchema("network.proxy", "")`
`73`	`73`	`setKeyTypeSchema("network.user_agent_ext", "")`
	`74`	`+ setKeyTypeSchema("network.connection_timeout", 0)`
`74`	`75`
`75`	`76`	`// locale`
`76`	`77`	`setKeyTypeSchema("locale", "")`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ import (`
`22`	`22`	`"net/url"`
`23`	`23`	`"os"`
`24`	`24`	`"runtime"`
	`25`	`+ "time"`
`25`	`26`
`26`	`27`	`"github.com/arduino/arduino-cli/commands/cmderrors"`
`27`	`28`	`"github.com/arduino/arduino-cli/internal/i18n"`
`@@ -58,6 +59,11 @@ func (settings *Settings) ExtraUserAgent() string {`
`58`	`59`	`return settings.GetString("network.user_agent_ext")`
`59`	`60`	`}`
`60`	`61`
	`62`	`+func (settings *Settings) ConnectionTimeout() time.Duration {`
	`63`	`+ timeout := settings.GetInt("network.connection_timeout")`
	`64`	`+ return time.Duration(timeout) * time.Second`
	`65`	`+}`
	`66`	`+`
`61`	`67`	`// NetworkProxy returns the proxy configuration (mainly used by HTTP clients)`
`62`	`68`	`func (settings Settings) NetworkProxy() (url.URL, error) {`
`63`	`69`	`if proxyConfig, ok, _ := settings.GetStringOk("network.proxy"); !ok {`
`@@ -82,6 +88,7 @@ func (settings Settings) NewHttpClient() (http.Client, error) {`
`82`	`88`	`},`
`83`	`89`	`userAgent: settings.UserAgent(),`
`84`	`90`	`},`
	`91`	`+ Timeout: settings.ConnectionTimeout(),`
`85`	`92`	`}, nil`
`86`	`93`	`}`
`87`	`94`

Comments

(0)