Skip to content

Commit dd58e54

Browse files
committed
Don't log warnings when special mounts can't be stated in Storage page
1 parent 21acf88 commit dd58e54

1 file changed

Lines changed: 15 additions & 5 deletions

File tree

  • internal/app/deviceadmin/routes/storage

internal/app/deviceadmin/routes/storage/routes.go

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,15 @@ func getStorageViewData(
8686
vd.DiskUsages[dev.Drive.ID] = make(map[string]du.Usage)
8787
for _, mp := range dev.Filesystem.MountPoints {
8888
if vd.DiskUsages[dev.Drive.ID][mp], err = du.GetUsage(mp); err != nil {
89-
switch {
90-
default:
89+
ignored := false
90+
for _, ignoredPrefix := range ignoredMountPrefixes {
91+
if strings.HasPrefix(mp, ignoredPrefix) {
92+
ignored = true
93+
break
94+
}
95+
}
96+
if !ignored {
9197
l.Warn(errors.Wrapf(err, "couldn't check disk usage of %s", mp))
92-
case strings.HasPrefix(mp, "/sysroot/"):
93-
case strings.HasPrefix(mp, "/run/forklift/"):
94-
case strings.HasPrefix(mp, "/home/pi/.local/share/forklift/"):
9598
}
9699
}
97100
}
@@ -118,6 +121,13 @@ func getStorageViewData(
118121
return vd, nil
119122
}
120123

124+
var ignoredMountPrefixes = []string{
125+
"/boot/",
126+
"/sysroot/",
127+
"/run/forklift/",
128+
"/home/pi/.local/share/forklift/",
129+
}
130+
121131
func (h *Handlers) HandleStoragePub() turbostreams.HandlerFunc {
122132
t := "storage/index.page.tmpl"
123133
h.r.MustHave(t)

0 commit comments

Comments
 (0)