From 915083b426446573f87eed0c5a8e8392464457c3 Mon Sep 17 00:00:00 2001
From: decentral1se <lukewm@riseup.net>
Date: Sun, 14 Nov 2021 23:15:35 +0100
Subject: [PATCH] fix: time out on 60 sec + of converge checks

See https://git.coopcloud.tech/coop-cloud/organising/issues/246.
---
 pkg/upstream/stack/stack.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkg/upstream/stack/stack.go b/pkg/upstream/stack/stack.go
index 936bbe0f..1f11ab59 100644
--- a/pkg/upstream/stack/stack.go
+++ b/pkg/upstream/stack/stack.go
@@ -6,6 +6,7 @@ import (
 	"io"
 	"io/ioutil"
 	"strings"
+	"time"
 
 	abraClient "coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/upstream/convert"
@@ -479,5 +480,13 @@ func waitOnService(ctx context.Context, cl *dockerclient.Client, serviceID strin
 	}()
 
 	go io.Copy(ioutil.Discard, pipeReader)
-	return <-errChan
+
+	timeout := 60 * time.Second
+
+	select {
+	case err := <-errChan:
+		return err
+	case <-time.After(timeout):
+		return fmt.Errorf("%s has still not converged (%s second timeout)?", serviceID, timeout)
+	}
 }