Skip to content

feat: Make handling of invalid devices configurable #266

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Make handling of invalid devices configurable #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ var (
"smartctl.scan-device-type",
"Device type to use during automatic scan. Special by-id value forces predictable device names. (repeatable)",
).Strings()
smartctlExcludeENXIO = kingpin.Flag("smartctl.exclude-enxio",
"Whether or not to exclude devices where open() returns with ENXIO",
).Default("false").Bool()
smartctlFakeData = kingpin.Flag("smartctl.fake-data",
"The device to monitor (repeatable)",
).Default("false").Hidden().Bool()
Expand All @@ -132,6 +135,13 @@ func scanDevices(logger *slog.Logger) []Device {
for _, d := range scanDevices {
deviceName := d.Get("name").String()
deviceType := d.Get("type").String()
deviceOpenError := d.Get("open_error").String()

if *smartctlExcludeENXIO && deviceOpenError == "No such device or address" {
// Ignore devices that do not exist (anymore) or were not properly cleaned up
// This effectively means open(device) returned ENXIO
continue
}

// SATA devices are reported as SCSI during scan - fallback to auto scraping
if deviceType == "scsi" {
Expand Down
2 changes: 1 addition & 1 deletion readjson.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func readSMARTctl(logger *slog.Logger, device Device) (gjson.Result, bool) {

func readSMARTctlDevices(logger *slog.Logger) gjson.Result {
logger.Debug("Scanning for devices")
var scanArgs []string = []string{"--json", "--scan"}
var scanArgs []string = []string{"--json", "--scan-open"}
for _, d := range *smartctlScanDeviceTypes {
scanArgs = append(scanArgs, "--device", d)
}
Expand Down