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

Add per area log levels at command line (#4813)

Browse source
This commit is contained in:
andig 2022-10-14 17:51:53 +02:00 • committed by GitHub
parent e5a65bc1b9
commit bafb3a7e79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 27 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cmd/charger.go
View file

@ -6,10 +6,7 @@ import (
"strings"
"github.com/evcc-io/evcc/api"
"github.com/evcc-io/evcc/server"
"github.com/evcc-io/evcc/util"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
// chargerCmd represents the charger command
@ -34,16 +31,11 @@ func init() {
}
func runCharger(cmd *cobra.Command, args []string) {
util.LogLevel(viper.GetString("log"), viper.GetStringMapString("levels"))
log.INFO.Printf("evcc %s", server.FormattedVersion())
// load config
if err := loadConfigFile(&conf); err != nil {
log.FATAL.Fatal(err)
}
util.LogLevel(viper.GetString("log"), viper.GetStringMapString("levels"))
// setup environment
if err := configureEnvironment(cmd, conf); err != nil {
log.FATAL.Fatal(err)

8
cmd/charger_ramp.go
View file

@ -7,10 +7,7 @@ import (
"time"
"github.com/evcc-io/evcc/api"
"github.com/evcc-io/evcc/server"
"github.com/evcc-io/evcc/util"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
// cmdEcho.AddCommand
@ -68,16 +65,11 @@ func ramp(c api.Charger, digits int, delay time.Duration) {
}
func runChargerRamp(cmd *cobra.Command, args []string) {
util.LogLevel(viper.GetString("log"), viper.GetStringMapString("levels"))
log.INFO.Printf("evcc %s", server.FormattedVersion())
// load config
if err := loadConfigFile(&conf); err != nil {
log.FATAL.Fatal(err)
}
util.LogLevel(viper.GetString("log"), viper.GetStringMapString("levels"))
// setup environment
if err := configureEnvironment(cmd, conf); err != nil {
log.FATAL.Fatal(err)

7
cmd/discuss.go
View file

@ -9,10 +9,8 @@ import (
"text/template"
"github.com/evcc-io/evcc/server"
"github.com/evcc-io/evcc/util"
"github.com/pkg/browser"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
// discussCmd represents the discuss command
@ -37,13 +35,8 @@ func errorString(err error) string {
}
func runDiscuss(cmd *cobra.Command, args []string) {
util.LogLevel(viper.GetString("log"), viper.GetStringMapString("levels"))
log.INFO.Printf("evcc %s", server.FormattedVersion())
cfgErr := loadConfigFile(&conf)
util.LogLevel(viper.GetString("log"), viper.GetStringMapString("levels"))
file, pathErr := filepath.Abs(cfgFile)
if pathErr != nil {
file = cfgFile

7
cmd/dump.go
View file

@ -11,9 +11,7 @@ import (
"github.com/Masterminds/sprig/v3"
"github.com/evcc-io/evcc/core"
"github.com/evcc-io/evcc/server"
"github.com/evcc-io/evcc/util"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
// dumpCmd represents the meter command
@ -44,14 +42,9 @@ func handle(device any, err error) any {
}
func runDump(cmd *cobra.Command, args []string) {
util.LogLevel(viper.GetString("log"), viper.GetStringMapString("levels"))
log.INFO.Printf("evcc %s", server.FormattedVersion())
// load config
err := loadConfigFile(&conf)
util.LogLevel(viper.GetString("log"), viper.GetStringMapString("levels"))
// setup environment
if err == nil {
err = configureEnvironment(cmd, conf)

5
cmd/eebus.go
View file

@ -8,9 +8,7 @@ import (
"github.com/Masterminds/sprig/v3"
certhelper "github.com/evcc-io/eebus/cert"
"github.com/evcc-io/evcc/server"
"github.com/evcc-io/evcc/util"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
// teslaCmd represents the vehicle command
@ -64,8 +62,5 @@ func generateEEBUSCert() {
}
func runEEBUSCert(cmd *cobra.Command, args []string) {
util.LogLevel(viper.GetString("log"), viper.GetStringMapString("levels"))
log.INFO.Printf("evcc %s", server.FormattedVersion())
generateEEBUSCert()
}

5
cmd/health.go
View file

@ -9,9 +9,7 @@ import (
"time"
"github.com/evcc-io/evcc/server"
"github.com/evcc-io/evcc/util"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/tv42/httpunix"
)
@ -29,9 +27,6 @@ func init() {
}
func runHealth(cmd *cobra.Command, args []string) {
util.LogLevel(viper.GetString("log"), viper.GetStringMapString("levels"))
log.INFO.Printf("evcc %s", server.FormattedVersion())
u := &httpunix.Transport{
DialTimeout: 100 * time.Millisecond,
RequestTimeout: 1 * time.Second,

19
cmd/helper.go
View file

@ -11,8 +11,27 @@ import (
"time"
"github.com/evcc-io/evcc/cmd/shutdown"
"github.com/evcc-io/evcc/util"
"github.com/spf13/viper"
)
// logLevel parses --log area:level[,...] switch into levels per log area
func logLevel() {
levels := viper.GetStringMapString("levels")
var level string
for _, kv := range strings.Split(viper.GetString("log"), ",") {
areaLevel := strings.SplitN(kv, ":", 2)
if len(areaLevel) == 1 {
level = areaLevel[0]
} else {
levels[areaLevel[0]] = areaLevel[1]
}
}
util.LogLevel(level, levels)
}
// unwrap converts a wrapped error into slice of strings
func unwrap(err error) (res []string) {
for err != nil {

8
cmd/meter.go
View file

@ -4,10 +4,7 @@ import (
"fmt"
"github.com/evcc-io/evcc/api"
"github.com/evcc-io/evcc/server"
"github.com/evcc-io/evcc/util"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
// meterCmd represents the meter command
@ -23,16 +20,11 @@ func init() {
}
func runMeter(cmd *cobra.Command, args []string) {
util.LogLevel(viper.GetString("log"), viper.GetStringMapString("levels"))
log.INFO.Printf("evcc %s", server.FormattedVersion())
// load config
if err := loadConfigFile(&conf); err != nil {
log.FATAL.Fatal(err)
}
util.LogLevel(viper.GetString("log"), viper.GetStringMapString("levels"))
// setup environment
if err := configureEnvironment(cmd, conf); err != nil {
log.FATAL.Fatal(err)

9
cmd/root.go
View file

@ -81,6 +81,10 @@ func initConfig() {
}
viper.AutomaticEnv() // read in environment variables that match
// print version
util.LogLevel("info", nil)
log.INFO.Printf("evcc %s", server.FormattedVersion())
}
// Execute adds all child commands to the root command and sets flags appropriately.
@ -98,9 +102,6 @@ func publish(key string, val any) {
}
func runRoot(cmd *cobra.Command, args []string) {
util.LogLevel(viper.GetString("log"), viper.GetStringMapString("levels"))
log.INFO.Printf("evcc %s", server.FormattedVersion())
// load config and re-configure logging after reading config file
var err error
if cfgErr := loadConfigFile(&conf); errors.As(cfgErr, &viper.ConfigFileNotFoundError{}) {
@ -110,8 +111,6 @@ func runRoot(cmd *cobra.Command, args []string) {
err = cfgErr
}
util.LogLevel(viper.GetString("log"), viper.GetStringMapString("levels"))
// network config
if viper.GetString("uri") != "" {
log.WARN.Println("`uri` is deprecated and will be ignored. Use `network` instead.")

4
cmd/setup.go
View file

@ -55,6 +55,10 @@ func loadConfigFile(conf *config) error {
}
}
if err == nil {
logLevel()
}
return err
}

8
cmd/token.go
View file

@ -4,11 +4,8 @@ import (
"fmt"
"strings"
"github.com/evcc-io/evcc/server"
"github.com/evcc-io/evcc/util"
"github.com/samber/lo"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"golang.org/x/exp/slices"
"golang.org/x/oauth2"
)
@ -25,16 +22,11 @@ func init() {
}
func runToken(cmd *cobra.Command, args []string) {
util.LogLevel(viper.GetString("log"), viper.GetStringMapString("levels"))
log.INFO.Printf("evcc %s", server.FormattedVersion())
// load config
if err := loadConfigFile(&conf); err != nil {
log.FATAL.Fatal(err)
}
util.LogLevel(viper.GetString("log"), viper.GetStringMapString("levels"))
var vehicleConf qualifiedConfig
if len(conf.Vehicles) == 1 {
vehicleConf = conf.Vehicles[0]

8
cmd/vehicle.go
View file

@ -4,10 +4,7 @@ import (
"fmt"
"github.com/evcc-io/evcc/api"
"github.com/evcc-io/evcc/server"
"github.com/evcc-io/evcc/util"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
// vehicleCmd represents the vehicle command
@ -26,16 +23,11 @@ func init() {
}
func runVehicle(cmd *cobra.Command, args []string) {
util.LogLevel(viper.GetString("log"), viper.GetStringMapString("levels"))
log.INFO.Printf("evcc %s", server.FormattedVersion())
// load config
if err := loadConfigFile(&conf); err != nil {
fatal(err)
}
util.LogLevel(viper.GetString("log"), viper.GetStringMapString("levels"))
// setup environment
if err := configureEnvironment(cmd, conf); err != nil {
fatal(err)