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.

Sign up for GitHub

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

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8626aba
Improve error logging for pluggable monitor
cmaglie Jan 25, 2022
206ec5d
Force quit of pluggable monitor if the port open fails
cmaglie Jan 25, 2022
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 7 additions & 1 deletion commands/monitor/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down