fix(ooniprobe): remove empty measurements directories (#720)

See https://github.com/ooni/probe/issues/2090

Co-authored-by: Simone Basso <bassosimone@gmail.com>
This commit is contained in:
stergem
2022-05-18 16:32:38 +03:00
committed by GitHub
parent 1f83c19853
commit 143fd498d5
2 changed files with 14 additions and 2 deletions
+13
View File
@@ -2,6 +2,7 @@ package nettests
import (
"context"
"os"
"sync"
"time"
@@ -113,6 +114,18 @@ func RunGroup(config RunGroupConfig) error {
}
}
// Remove the directory if it's emtpy, which happens when the corresponding
// measurements have been submitted (see https://github.com/ooni/probe/issues/2090)
dir, err := os.Open(result.MeasurementDir)
if err != nil {
return err
}
defer dir.Close()
_, err = dir.Readdirnames(1)
if err != nil {
os.Remove(result.MeasurementDir)
}
if err = result.Finished(config.Probe.DB()); err != nil {
return err
}