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

Proxy: improve logging (#6766)

Browse source
This commit is contained in:
andig 2023-03-10 22:21:40 +01:00 • committed by GitHub
parent 82a933033e
commit a200809212
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 43 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -8,7 +8,7 @@ require (
github.com/Masterminds/sprig/v3 v3.2.3
github.com/PuerkitoBio/goquery v1.8.1
github.com/andig/gosunspec v0.0.0-20211108155140-af2e73b86e71
github.com/andig/mbserver v0.0.0-20230310203303-a5f054e2e6e7
github.com/andig/mbserver v0.0.0-20230310211055-1d29cbb5820e
github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef
github.com/avast/retry-go/v3 v3.1.1
github.com/aws/aws-sdk-go v1.44.212

4
go.sum
View file

@ -225,8 +225,8 @@ github.com/andig/go-powerwall v0.2.1-0.20230102102528-4d59ac6910c6 h1:DxdKrb4O3B
github.com/andig/go-powerwall v0.2.1-0.20230102102528-4d59ac6910c6/go.mod h1:MR0vuGPmz9sLXrIAsdkXulW1j6t6svVr2D1nJKaJI78=
github.com/andig/gosunspec v0.0.0-20211108155140-af2e73b86e71 h1:tnjVNZjuz+CK6fdc7ohJpMHjcEGFI5APp0l5T5Ocr/Y=
github.com/andig/gosunspec v0.0.0-20211108155140-af2e73b86e71/go.mod h1:c6P6szcR+ROkqZruOR4f6qbDKFjZX6OitPpj+yJ/r8k=
github.com/andig/mbserver v0.0.0-20230310203303-a5f054e2e6e7 h1:INf2QLw+J0ArrvuZusnhIb4msWWk6KkP3+V6ZDkRj+s=
github.com/andig/mbserver v0.0.0-20230310203303-a5f054e2e6e7/go.mod h1:4VtYzTm//oUipwvO3yh0g/udTE7pYJM+U/kyAuFDsgM=
github.com/andig/mbserver v0.0.0-20230310211055-1d29cbb5820e h1:m/NTP3JWpR7M0ljLxiQU4fzR25jjhe1LDtxLMNcoNJQ=
github.com/andig/mbserver v0.0.0-20230310211055-1d29cbb5820e/go.mod h1:4VtYzTm//oUipwvO3yh0g/udTE7pYJM+U/kyAuFDsgM=
github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c=
github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=

39
server/modbus/log.go Normal file
View file

@ -0,0 +1,39 @@
package modbus
import "github.com/evcc-io/evcc/util"
type logger struct {
log *util.Logger
}
func (l *logger) Info(msg string) {
l.log.DEBUG.Println(msg)
}
func (l *logger) Infof(format string, msg ...any) {
l.log.DEBUG.Printf(format, msg...)
}
func (l *logger) Warning(msg string) {
l.log.DEBUG.Println(msg)
}
func (l *logger) Warningf(format string, msg ...any) {
l.log.DEBUG.Printf(format, msg...)
}
func (l *logger) Error(msg string) {
l.log.ERROR.Println(msg)
}
func (l *logger) Errorf(format string, msg ...any) {
l.log.ERROR.Printf(format, msg...)
}
func (l *logger) Fatal(msg string) {
l.log.ERROR.Println(msg)
}
func (l *logger) Fatalf(format string, msg ...any) {
l.log.ERROR.Printf(format, msg...)
}

2
server/modbus/proxy.go
View file

@ -35,7 +35,7 @@ func StartProxy(port int, config modbus.Settings, readOnly bool) error {
h.log.DEBUG.Printf("modbus proxy for %s listening at :%d", config.String(), port)
srv, err := mbserver.New(h)
srv, err := mbserver.New(h, mbserver.Logger(&logger{log: h.log}))
if err == nil {
err = srv.Start(l)