Refactor the expiry time logic

ooni · Jun 1, 2018 · 17c8d9e · 17c8d9e
1 parent 29e37af
commit 17c8d9e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/collector/collector.go b/collector/collector.go
@@ -71,8 +71,10 @@ func Start() {
 		return
 	}
 
+	// We setup the timers so that pending reports will expire the
+	// ExpiryTimeDuration after the server has been rebooted
 	for _, meta := range reportList {
-		report.ExpiryTimers[meta.ReportID] = time.AfterFunc(time.Duration(8)*time.Hour, func() {
+		report.ExpiryTimers[meta.ReportID] = time.AfterFunc(report.ExpiryTimeDuration, func() {
 			handler.CloseReport(store, meta.ReportID)
 		})
 	}

diff --git a/collector/handler/handler.go b/collector/handler/handler.go
@@ -23,8 +23,6 @@ var log = apexLog.WithFields(apexLog.Fields{
 
 const backendVersion = "2.0.0-alpha"
 
-var reportExpiryTime = time.Duration(8) * time.Hour
-
 func createNewReport(store *storage.Storage, req CreateReportRequest) (string, error) {
 	reportID := report.GenReportID(req.ProbeASN)
 	tmpPath := filepath.Join(paths.TempReportDir(), reportID)
@@ -44,7 +42,7 @@ func createNewReport(store *storage.Storage, req CreateReportRequest) (string, e
 	store.SetReport(&meta)
 	os.OpenFile(tmpPath, os.O_RDONLY|os.O_CREATE, 0700)
 
-	report.ExpiryTimers[reportID] = time.AfterFunc(reportExpiryTime, func() {
+	report.ExpiryTimers[reportID] = time.AfterFunc(report.ExpiryTimeDuration, func() {
 		CloseReport(store, reportID)
 	})
 
@@ -128,7 +126,7 @@ func addBackendExtra(meta *report.Metadata, entry *report.MeasurementEntry) {
 }
 
 func writeEntry(store *storage.Storage, entry *report.MeasurementEntry) error {
-	report.ExpiryTimers[entry.ReportID].Reset(reportExpiryTime)
+	report.ExpiryTimers[entry.ReportID].Reset(report.ExpiryTimeDuration)
 
 	meta, err := store.GetReport(entry.ReportID)
 	if err != nil {
@@ -212,7 +210,7 @@ func UpdateReportHandler(c *gin.Context) {
 
 // CloseReport marks the report as closed and moves it into the final reports folder
 func CloseReport(store *storage.Storage, reportID string) error {
-	report.ExpiryTimers[reportID].Reset(reportExpiryTime)
+	report.ExpiryTimers[reportID].Reset(report.ExpiryTimeDuration)
 
 	meta, err := store.GetReport(reportID)
 	if err != nil {

diff --git a/collector/report/report.go b/collector/report/report.go
@@ -11,6 +11,9 @@ import (
 // ensure that after a certain amount of time has elapsed reports are closed
 var ExpiryTimers = make(map[string]*time.Timer)
 
+// ExpiryTimeDuration is after how much time a report expires
+var ExpiryTimeDuration = time.Duration(8) * time.Hour
+
 // BackendExtra is serverside extra metadata
 type BackendExtra struct {
 	SubmissionTime time.Time `json:"submission_time"`