Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: add timeout to charger, vehicle, dump (#24168)

Browse source
This commit is contained in:
premultiply 2025-10-12 08:27:05 +02:00 • committed by GitHub
parent 6d5b0a5ab5
commit f8b6c367de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmd/charger.go
View file

@ -29,6 +29,7 @@ func init() {
chargerCmd.Flags().BoolP(flagWakeup, "w", false, flagWakeupDescription)
chargerCmd.Flags().IntP(flagPhases, "p", 0, flagPhasesDescription)
chargerCmd.Flags().Bool(flagHeartbeat, false, flagHeartbeatDescription)
chargerCmd.Flags().Duration(flagTimeout, time.Second, flagTimeoutDescription)
}
func runCharger(cmd *cobra.Command, args []string) {
@ -125,7 +126,8 @@ func runCharger(cmd *cobra.Command, args []string) {
}
if !flagUsed {
d := dumper{len: len(chargers)}
timeout, _ := cmd.Flags().GetDuration(flagTimeout)
d := dumper{len: len(chargers), timeout: timeout}
flag := cmd.Flag(flagDiagnose).Changed
for _, dev := range chargers {

5
cmd/dump.go
View file

@ -7,6 +7,7 @@ import (
"os"
"path/filepath"
"text/template"
"time"
"github.com/Masterminds/sprig/v3"
"github.com/evcc-io/evcc/core"
@ -33,6 +34,7 @@ func init() {
rootCmd.AddCommand(dumpCmd)
dumpConfig = dumpCmd.Flags().Bool("cfg", false, "Dump config file")
dumpCmd.Flags().Duration(flagTimeout, time.Second, flagTimeoutDescription)
}
func handle[T any](name string, h config.Handler[T]) config.Device[T] {
@ -90,7 +92,8 @@ func runDump(cmd *cobra.Command, args []string) {
log.FATAL.Fatal(err)
}
d := dumper{len: 2}
timeout, _ := cmd.Flags().GetDuration(flagTimeout)
d := dumper{len: 2, timeout: timeout}
d.Header("config", "=")
fmt.Println("")

5
cmd/vehicle.go
View file

@ -3,6 +3,7 @@ package cmd
import (
"fmt"
"strconv"
"time"
"github.com/evcc-io/evcc/api"
"github.com/evcc-io/evcc/util/config"
@ -25,6 +26,7 @@ func init() {
vehicleCmd.Flags().BoolP(flagWakeup, "w", false, flagWakeupDescription)
vehicleCmd.Flags().Bool(flagDiagnose, false, flagDiagnoseDescription)
vehicleCmd.Flags().Bool(flagCloud, false, flagCloudDescription)
vehicleCmd.Flags().Duration(flagTimeout, time.Second, flagTimeoutDescription)
}
func runVehicle(cmd *cobra.Command, args []string) {
@ -112,7 +114,8 @@ func runVehicle(cmd *cobra.Command, args []string) {
}
if !flagUsed {
d := dumper{len: len(vehicles)}
timeout, _ := cmd.Flags().GetDuration(flagTimeout)
d := dumper{len: len(vehicles), timeout: timeout}
flag := cmd.Flag(flagDiagnose).Changed
for _, dev := range vehicles {