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:
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user