Skip to content
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.

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

Limit trace log level to physical communication #1240

Merged
merged 2 commits into from
Jul 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion charger/nrgble_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ func (nrg *NRGKickBLE) Status() (api.ChargeStatus, error) {
func (nrg *NRGKickBLE) Enabled() (bool, error) {
res := nrgble.Info{}
if err := nrg.read(nrgble.InfoService, &res); err != nil {
nrg.log.TRACE.Println(err)
return false, err
}

Expand Down
2 changes: 1 addition & 1 deletion core/site.go
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ func (site *Site) updateMeters() error {
if phaseMeter, ok := site.gridMeter.(api.MeterCurrent); err == nil && ok {
i1, i2, i3, err := phaseMeter.Currents()
if err == nil {
site.log.TRACE.Printf("grid currents: %.3gA", []float64{i1, i2, i3})
site.log.DEBUG.Printf("grid currents: %.3gA", []float64{i1, i2, i3})
site.publish("gridCurrents", []float64{i1, i2, i3})
}
}
Expand Down
4 changes: 2 additions & 2 deletions core/soc/estimator.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,15 @@ func (s *Estimator) SoC(chargedEnergy float64) (float64, error) {
if socDelta > 2 && energyDelta > 0 && s.prevSoC > 0 {
s.energyPerSocStep = energyDelta / socDelta
s.virtualCapacity = s.energyPerSocStep * 100
s.log.TRACE.Printf("soc gradient updated: energyPerSocStep: %0.0fWh, virtualCapacity: %0.0fWh", s.energyPerSocStep, s.virtualCapacity)
s.log.DEBUG.Printf("soc gradient updated: energyPerSocStep: %0.0fWh, virtualCapacity: %0.0fWh", s.energyPerSocStep, s.virtualCapacity)
}

// sample charged energy at soc change, reset energy delta
s.prevChargedEnergy = math.Max(chargedEnergy, 0)
s.prevSoC = s.socCharge
} else {
s.socCharge = math.Min(f+energyDelta/s.energyPerSocStep, 100)
s.log.TRACE.Printf("soc estimated: %.2f%% (vehicle: %.2f%%)", s.socCharge, f)
s.log.DEBUG.Printf("soc estimated: %.2f%% (vehicle: %.2f%%)", s.socCharge, f)
}
}

Expand Down
2 changes: 1 addition & 1 deletion detect/tasks/modbus.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func (h *ModbusHandler) testSunSpec(log *util.Logger, conn meters.Connection, de
mr.Point = h.Point
mr.Value = res.Value()

log.TRACE.Printf("model %d point %s: %v", model, mr.Point, mr.Value)
log.DEBUG.Printf("model %d point %s: %v", model, mr.Point, mr.Value)

if len(h.Invalid) == 0 {
return true
Expand Down
2 changes: 1 addition & 1 deletion hems/ocpp/ocpp.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func (s *OCPP) Run() {
status = ocppcore.ChargePointStatusCharging
}

s.log.TRACE.Printf("send: lp-%d status: %+v", connector, status)
s.log.DEBUG.Printf("send: lp-%d status: %+v", connector, status)
if _, err := s.cp.StatusNotification(connector, ocppcore.NoError, status); err != nil {
s.log.ERROR.Printf("lp-%d: %v", connector, err)
}
Expand Down
8 changes: 4 additions & 4 deletions provider/mqtt.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func (m *Mqtt) FloatGetter() func() (float64, error) {
h := &msgHandler{
topic: m.topic,
scale: m.scale,
mux: util.NewWaiter(m.timeout, func() { m.log.TRACE.Printf("%s wait for initial value", m.topic) }),
mux: util.NewWaiter(m.timeout, func() { m.log.DEBUG.Printf("%s wait for initial value", m.topic) }),
jq: m.jq,
}

Expand All @@ -115,7 +115,7 @@ func (m *Mqtt) IntGetter() func() (int64, error) {
h := &msgHandler{
topic: m.topic,
scale: float64(m.scale),
mux: util.NewWaiter(m.timeout, func() { m.log.TRACE.Printf("%s wait for initial value", m.topic) }),
mux: util.NewWaiter(m.timeout, func() { m.log.DEBUG.Printf("%s wait for initial value", m.topic) }),
jq: m.jq,
}

Expand All @@ -129,7 +129,7 @@ var _ StringProvider = (*Mqtt)(nil)
func (m *Mqtt) StringGetter() func() (string, error) {
h := &msgHandler{
topic: m.topic,
mux: util.NewWaiter(m.timeout, func() { m.log.TRACE.Printf("%s wait for initial value", m.topic) }),
mux: util.NewWaiter(m.timeout, func() { m.log.DEBUG.Printf("%s wait for initial value", m.topic) }),
jq: m.jq,
}

Expand All @@ -143,7 +143,7 @@ var _ BoolProvider = (*Mqtt)(nil)
func (m *Mqtt) BoolGetter() func() (bool, error) {
h := &msgHandler{
topic: m.topic,
mux: util.NewWaiter(m.timeout, func() { m.log.TRACE.Printf("%s wait for initial value", m.topic) }),
mux: util.NewWaiter(m.timeout, func() { m.log.DEBUG.Printf("%s wait for initial value", m.topic) }),
jq: m.jq,
}

Expand Down
2 changes: 1 addition & 1 deletion provider/mqtt/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (m *Client) ConnectionHandler(client paho.Client) {
defer m.mux.Unlock()

for topic := range m.listener {
m.log.TRACE.Printf("%s subscribe %s", m.broker, topic)
m.log.DEBUG.Printf("%s subscribe %s", m.broker, topic)
go m.listen(topic)
}
}
Expand Down
6 changes: 3 additions & 3 deletions provider/script.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func NewScriptProvider(script string, timeout time.Duration, jq string, cache ti
timeout: timeout,
cache: cache,
}

if jq != "" {
op, err := gojq.Parse(jq)
if err != nil {
Expand Down Expand Up @@ -96,7 +96,7 @@ func (e *Script) exec(script string) (string, error) {
return "", err
}

e.log.TRACE.Printf("%s: %s", strings.Join(args, " "), s)
e.log.DEBUG.Printf("%s: %s", strings.Join(args, " "), s)

return s, nil
}
Expand All @@ -115,7 +115,7 @@ func (e *Script) StringGetter() func() (string, error) {
}
}
}

return e.val, e.err
}
}
Expand Down
2 changes: 1 addition & 1 deletion provider/sma/discover.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func (d *Discoverer) createDevice(device *sunny.Device) *Device {
return &Device{
Device: device,
log: d.log,
mux: util.NewWaiter(udpTimeout, func() { d.log.TRACE.Println("wait for initial value") }),
mux: util.NewWaiter(udpTimeout, func() { d.log.DEBUG.Println("wait for initial value") }),
values: make(map[sunny.ValueID]interface{}),
}
}
Expand Down
2 changes: 1 addition & 1 deletion provider/socket.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func NewSocketProviderFromConfig(other map[string]interface{}) (IntProvider, err
p := &Socket{
log: log,
Helper: request.NewHelper(log),
mux: util.NewWaiter(cc.Timeout, func() { log.TRACE.Println("wait for initial value") }),
mux: util.NewWaiter(cc.Timeout, func() { log.DEBUG.Println("wait for initial value") }),
url: url,
headers: cc.Headers,
scale: cc.Scale,
Expand Down
2 changes: 1 addition & 1 deletion push/pushover.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (m *PushOver) Send(title, msg string) {

for _, id := range m.recipients {
go func(id string) {
log.TRACE.Printf("pushover: sending to %s", id)
log.DEBUG.Printf("pushover: sending to %s", id)

recipient := pushover.NewRecipient(id)
if _, err := m.app.SendMessage(message, recipient); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion push/telegram.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func (m *Telegram) trackChats() {
func (m *Telegram) Send(title, msg string) {
m.Lock()
for chat := range m.chats {
log.TRACE.Printf("telegram: sending to %d", chat)
log.DEBUG.Printf("telegram: sending to %d", chat)

msg := tgbotapi.NewMessage(chat, msg)
if _, err := m.bot.Send(msg); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion util/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func (c *Cache) Run(in <-chan Param) {
log := NewLogger("cache")

for p := range in {
log.TRACE.Printf("%s: %v", p.Key, p.Val)
log.DEBUG.Printf("%s: %v", p.Key, p.Val)
c.Add(p.UniqueID(), p)
}
}
Expand Down