Minor improvements to the service goroutine

service/service.go

@@ -18,8 +18,10 @@ const (
 	MsgWaybackTimeout  = "wayback timeout, please try later."
 )
 
+type doFunc func(cols []wayback.Collect, rdx reduxer.Reduxer) error
+
 // Wayback in a separate goroutine.
-func Wayback(ctx context.Context, urls []*url.URL, do func(cols []wayback.Collect, rdx reduxer.Reduxer) error) error {
+func Wayback(ctx context.Context, urls []*url.URL, do doFunc) error {
 	var done = make(chan error, 1)
 	var cols []wayback.Collect
 	var rdx reduxer.Reduxer
@@ -31,19 +33,23 @@ func Wayback(ctx context.Context, urls []*url.URL, do func(cols []wayback.Collec
 			done <- errors.Wrap(err, "wayback failed")
 			return
 		}
-		defer rdx.Flush()
-		// push collects to the Meilisearch
-		if meili != nil {
-			meili.push(cols)
-		}
-		done <- do(cols, rdx)
+		done <- nil
 	}()
 
 	select {
 	case <-ctx.Done():
 		return ctx.Err()
 	case err := <-done:
 		close(done)
-		return err
+		if err != nil {
+			return err
+		}
+		defer rdx.Flush()
+
+		// push collects to the Meilisearch
+		if meili != nil {
+			meili.push(cols)
+		}
+		return do(cols, rdx)
 	}
 }

service/utils_test.go

@@ -125,7 +125,7 @@ func TestWayback(t *testing.T) {
 	logger.SetLogLevel(logger.LevelFatal)
 
 	u, _ := url.Parse("https://example.com/")
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
 	defer cancel()
 	defer helper.CheckContext(ctx, t)