Set default duration to 60 seconds

arduino · cmaglie · Dec 18, 2024 · Nov 28, 2024 · Nov 28, 2024 · Nov 28, 2024
commit a1da0d8066d42e31e2323deda833b5dfcadeebc0
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -45,7 +45,8 @@
    [time.ParseDuration()](https://pkg.go.dev/time#ParseDuration), defaults to `720h` (30 days).
 - `network` - configuration options related to the network connection.
  - `proxy` - URL of the proxy server.
-  - `connection_timeout` - connection timeout in seconds, defaults to `0` which will wait indefinitely.
+  - `connection_timeout` - network connection timeout, the value format must be a valid input for
+    [time.ParseDuration()](https://pkg.go.dev/time#ParseDuration), defaults to `60s` (60 seconds). `0` means it will wait indefinitely.

 ### Default directories


diff --git a/internal/cli/configuration/defaults.go b/internal/cli/configuration/defaults.go
@@ -71,7 +71,7 @@ func SetDefaults(settings *Settings) {
 	// network settings
 	setKeyTypeSchema("network.proxy", "")
 	setKeyTypeSchema("network.user_agent_ext", "")
-	setKeyTypeSchema("network.connection_timeout", 0)
+	setDefaultValueAndKeyTypeSchema("network.connection_timeout", (time.Second * 60).String())

 	// locale
 	setKeyTypeSchema("locale", "")

diff --git a/internal/cli/configuration/network.go b/internal/cli/configuration/network.go
@@ -59,9 +59,12 @@ func (settings *Settings) ExtraUserAgent() string {
 	return settings.GetString("network.user_agent_ext")
 }

+// ConnectionTimeout returns the network connection timeout
 func (settings *Settings) ConnectionTimeout() time.Duration {
-	timeout := settings.GetInt("network.connection_timeout")
-	return time.Duration(timeout) * time.Second
+	if timeout, ok, _ := settings.GetDurationOk("network.connection_timeout"); ok {
+		return timeout
+	}
+	return settings.Defaults.GetDuration("network.connection_timeout")
 }

 // NetworkProxy returns the proxy configuration (mainly used by HTTP clients)