Skip to content

Improved error logging for pluggable monitors / Fixed resource leak in some rare conditions #1638

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

Merged
merged 2 commits into from
Jan 28, 2022
Merged
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
2 changes: 1 addition & 1 deletion arduino/monitor/monitor.go
Original file line number Diff line number Diff line change
@@ -111,7 +111,7 @@ func (mon *PluggableMonitor) jsonDecodeLoop(in io.Reader, outChan chan<- *monito
if err := decoder.Decode(&msg); err != nil {
mon.incomingMessagesError = err
close(outChan)
mon.log.Errorf("stopped decode loop")
mon.log.Errorf("stopped decode loop: %s", err)
return
}
mon.log.
8 changes: 7 additions & 1 deletion commands/monitor/monitor.go
Original file line number Diff line number Diff line change
@@ -28,6 +28,7 @@ import (
"github.com/arduino/arduino-cli/i18n"
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
"github.com/arduino/go-properties-orderedmap"
"github.com/sirupsen/logrus"
)

var tr = i18n.Tr
@@ -76,18 +77,23 @@ func Monitor(ctx context.Context, req *rpc.MonitorRequest) (*PortProxy, *pluggab

descriptor, err := m.Describe()
if err != nil {
m.Quit()
return nil, nil, &arduino.FailedMonitorError{Cause: err}
}

monIO, err := m.Open(req.GetPort().GetAddress(), req.GetPort().GetProtocol())
if err != nil {
m.Quit()
return nil, nil, &arduino.FailedMonitorError{Cause: err}
}

for _, setting := range req.GetPortConfiguration().Settings {
m.Configure(setting.SettingId, setting.Value)
if err := m.Configure(setting.SettingId, setting.Value); err != nil {
logrus.Errorf("Could not set configuration %s=%s: %s", setting.SettingId, setting.Value, err)
}
}

logrus.Infof("Port %s successfully opened", req.GetPort().GetAddress())
return &PortProxy{
rw: monIO,
changeSettingsCB: m.Configure,