Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 12, 2025
+11 −3
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cmd/charger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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 {
Expand Down
5 changes: 4 additions & 1 deletion cmd/dump.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"os"
"path/filepath"
"text/template"
"time"

"github.com/Masterminds/sprig/v3"
"github.com/evcc-io/evcc/core"
Expand All @@ -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] {
Expand Down Expand Up @@ -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("")
Expand Down
5 changes: 4 additions & 1 deletion cmd/vehicle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package cmd
import (
"fmt"
"strconv"
"time"

"github.com/evcc-io/evcc/api"
"github.com/evcc-io/evcc/util/config"
Expand All @@ -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) {
Expand Down Expand Up @@ -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 {
Expand Down
Loading