From 12b6f86e267de55b1e5f130d787ab6d46fe87b4d Mon Sep 17 00:00:00 2001
From: Jean-Marc Andre <jandre@desmojim.fr>
Date: Mon, 4 Jan 2021 00:58:42 +0100
Subject: [PATCH] reworked checkRepo logging and process spawning

---
 pkg/backup/root.go | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/pkg/backup/root.go b/pkg/backup/root.go
index 888122d..70fa207 100644
--- a/pkg/backup/root.go
+++ b/pkg/backup/root.go
@@ -36,31 +36,16 @@ func init() {
 }
 
 func checkRepo(repo string) error {
-	log := logger.WithName("backup-checkrepo")
+	log := logger.WithValues("backup-checkrepo", repo)
 	cmd := exec.Command(resticExec, "check", "-r", repo)
-	stderr, err := cmd.StderrPipe()
+	output, err := cmd.CombinedOutput()
+	log.V(1).Info("restic check output", "output", string(output))
 	if err != nil {
-		log.Error(err, "unable to pipe stderr")
-		return err
-	}
-	if err := cmd.Start(); err != nil {
-		log.Error(err, "cannot start repo check")
-		return err
-	}
-	if err := cmd.Wait(); err != nil {
 		log.V(0).Info("initializing new repo", "repo", repo)
 		cmd = exec.Command(resticExec, "init", "-r", repo)
-		if err := cmd.Start(); err != nil {
-			log.Error(err, "cannot start repo init")
-			return err
-		}
-		go func() {
-			scanner := bufio.NewScanner(stderr)
-			for scanner.Scan() {
-				log.V(0).Info("and error happened", "stderr", scanner.Text())
-			}
-		}()
-		if err := cmd.Wait(); err != nil {
+		output, err = cmd.CombinedOutput()
+		log.V(1).Info("restic init repo", "output", string(output))
+		if err != nil {
 			log.Error(err, "something went wrong during repo init")
 			return err
 		}