From c92e8669cc966ed4dd1bb8171c6cca30a8accadc Mon Sep 17 00:00:00 2001 From: andig Date: Sun, 27 Dec 2020 12:24:34 +0100 Subject: [PATCH] Remove unneeded closer interface --- api/api.go | 5 ----- cmd/charger.go | 3 --- cmd/config.go | 9 --------- cmd/dump.go | 3 --- cmd/meter.go | 3 --- cmd/root.go | 2 -- cmd/vehicle.go | 3 --- 7 files changed, 28 deletions(-) diff --git a/api/api.go b/api/api.go index 223cff702..88db66e75 100644 --- a/api/api.go +++ b/api/api.go @@ -111,8 +111,3 @@ type VehicleRange interface { type Climater interface { Climater() (active bool, outsideTemp float64, targetTemp float64, err error) } - -// Closer ends open sessions or connections -type Closer interface { - Close() error -} diff --git a/cmd/charger.go b/cmd/charger.go index 90ce24529..9a8594be2 100644 --- a/cmd/charger.go +++ b/cmd/charger.go @@ -32,12 +32,9 @@ func runCharger(cmd *cobra.Command, args []string) { } if err := cp.configureChargers(conf); err != nil { - cp.Close() // cleanup any open sessions log.FATAL.Fatal(err) } - defer cp.Close() // cleanup on exit - chargers := cp.chargers if len(args) == 1 { arg := args[0] diff --git a/cmd/config.go b/cmd/config.go index 5a5383d2f..a6ca22710 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -152,12 +152,3 @@ func (cp *ConfigProvider) configureVehicles(conf config) error { return nil } - -// Close performs cleanup activities on all entities maintained by the config provider -func (cp *ConfigProvider) Close() { - for _, o := range cp.vehicles { - if c, ok := o.(api.Closer); ok { - c.Close() - } - } -} diff --git a/cmd/dump.go b/cmd/dump.go index 76d02cf17..0ec76bc31 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -35,12 +35,9 @@ func runDump(cmd *cobra.Command, args []string) { site, err := loadConfig(conf) if err != nil { - cp.Close() // cleanup any open sessions log.FATAL.Fatal(err) } - defer cp.Close() // cleanup on exit - d := dumper{len: 2} d.Header("config", "=") diff --git a/cmd/meter.go b/cmd/meter.go index 68cc71afd..d8d7f2a5b 100644 --- a/cmd/meter.go +++ b/cmd/meter.go @@ -32,12 +32,9 @@ func runMeter(cmd *cobra.Command, args []string) { } if err := cp.configureMeters(conf); err != nil { - cp.Close() // cleanup any open sessions log.FATAL.Fatal(err) } - defer cp.Close() // cleanup on exit - meters := cp.meters if len(args) == 1 { arg := args[0] diff --git a/cmd/root.go b/cmd/root.go index 0f7390e19..4e4f5a33a 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -161,7 +161,6 @@ func run(cmd *cobra.Command, args []string) { // setup loadpoints site, err := loadConfig(conf) if err != nil { - cp.Close() log.FATAL.Fatal(err) } @@ -236,7 +235,6 @@ func run(cmd *cobra.Command, args []string) { <-signalC // wait for signal close(stopC) // signal loop to end <-exitC // wait for loop to end - cp.Close() // cleanup os.Exit(1) }() diff --git a/cmd/vehicle.go b/cmd/vehicle.go index c7f67ca9e..5c07f6da4 100644 --- a/cmd/vehicle.go +++ b/cmd/vehicle.go @@ -32,12 +32,9 @@ func runVehicle(cmd *cobra.Command, args []string) { } if err := cp.configureVehicles(conf); err != nil { - cp.Close() // cleanup any open sessions log.FATAL.Fatal(err) } - defer cp.Close() // cleanup on exit - vehicles := cp.vehicles if len(args) == 1 { arg := args[0]