backupds kvlog: Address review

lib/backupds/datastore.go

@@ -6,6 +6,7 @@ import (
 	"sync"
 	"time"
 
+	"go.uber.org/multierr"
 	"golang.org/x/xerrors"
 
 	"github.com/ipfs/go-datastore"
@@ -189,11 +190,10 @@ func (d *Datastore) CloseLog() error {
 }
 
 func (d *Datastore) Close() error {
-	if err := d.child.Close(); err != nil {
-		return xerrors.Errorf("closing child datastore: %w", err)
-	}
-
-	return d.CloseLog()
+	return multierr.Combine(
+		d.child.Close(),
+		d.CloseLog(),
+	)
 }
 
 func (d *Datastore) Batch() (datastore.Batch, error) {

lib/backupds/log.go

@@ -65,7 +65,12 @@ func (d *Datastore) startLog(logdir string) error {
 		return xerrors.Errorf("writing new log head: %w", err)
 	}
 
-	go func() {
+	go d.runLog(l)
+
+	return nil
+}
+
+func (d *Datastore) runLog(l *logfile) {
 	defer close(d.closed)
 	for {
 		select {
@@ -86,9 +91,6 @@ func (d *Datastore) startLog(logdir string) error {
 			return
 		}
 	}
-	}()
-
-	return nil
 }
 
 type logfile struct {