Merge pull request #290 from smothiki/bar

feat(progress):print status to avoid losing session

Author: Sivaram Mothiki

pkg/gitreceive/build.go

@@ -178,7 +178,7 @@ func build(
 		return fmt.Errorf("creating builder pod (%s)", err)
 	}
 
-	if err := waitForPod(kubeClient, newPod.Namespace, newPod.Name, conf.BuilderPodTickDuration(), conf.BuilderPodWaitDuration()); err != nil {
+	if err := waitForPod(kubeClient, newPod.Namespace, newPod.Name, conf.SessionIdleInterval(), conf.BuilderPodTickDuration(), conf.BuilderPodWaitDuration()); err != nil {
 		return fmt.Errorf("watching events for builder pod startup (%s)", err)
 	}
 
@@ -234,11 +234,13 @@ func build(
 	}
 
 	log.Info("Build complete.")
-	log.Info("Launching app.")
-	log.Info("Launching...")
 
 	buildHook := createBuildHook(slugBuilderInfo, gitSha, conf.Username, appName, procType, usingDockerfile)
+	quit := progress("...", conf.SessionIdleInterval())
 	buildHookResp, err := publishRelease(conf, builderKey, buildHook)
+	quit <- true
+	<-quit
+	log.Info("Launching App...")
 	if err != nil {
 		return fmt.Errorf("publishing release (%s)", err)
 	}

pkg/gitreceive/config.go

@@ -32,6 +32,7 @@ type Config struct {
 	BuilderPodWaitDurationMSec    int    `envconfig:"BUILDER_POD_WAIT_DURATION" default:"900000"` // 15 minutes
 	ObjectStorageTickDurationMSec int    `envconfing:"OBJECT_STORAGE_TICK_DURATION" default:"500"`
 	ObjectStorageWaitDurationMSec int    `envconfig:"OBJECT_STORAGE_WAIT_DURATION" default:"300000"` // 5 minutes
+	SessionIdleIntervalMsec       int    `envconfig:"SESSION_IDLE_INTERVAL" default:"10000"`         // 10 seconds
 	SlugBuilderImage              string `envconfig:"SLUGBUILDER_IMAGE_NAME" default:"quay.io/deisci/slugbuilder:v2-beta"`
 	DockerBuilderImage            string `envconfig:"DOCKERBUILDER_IMAGE_NAME" default:"quay.io/deisci/dockerbuilder:v2-beta"`
 	SlugBuilderImagePullPolicy    string `envconfig:"SLUG_BUILDER_IMAGE_PULL_POLICY" default:"Always"`
@@ -73,6 +74,11 @@ func (c Config) ObjectStorageWaitDuration() time.Duration {
 	return time.Duration(time.Duration(c.ObjectStorageWaitDurationMSec) * time.Millisecond)
 }
 
+// SessionIdleInterval returns the ticker interval to wait for status
+func (c Config) SessionIdleInterval() time.Duration {
+	return time.Duration(time.Duration(c.SessionIdleIntervalMsec) * time.Millisecond)
+}
+
 // CheckDurations checks if ticks for builder and object storage are not bigger
 // than the maximum duration. In case of this it will set the tick to the default.
 func (c *Config) CheckDurations() {

pkg/gitreceive/k8s_util.go

@@ -171,7 +171,7 @@ func addEnvToPod(pod api.Pod, key, value string) {
 }
 
 // waitForPod waits for a pod in state running or failed
-func waitForPod(c *client.Client, ns, podName string, interval, timeout time.Duration) error {
+func waitForPod(c *client.Client, ns, podName string, ticker, interval, timeout time.Duration) error {
 	condition := func(pod *api.Pod) (bool, error) {
 		if pod.Status.Phase == api.PodRunning {
 			return true, nil
@@ -182,7 +182,11 @@ func waitForPod(c *client.Client, ns, podName string, interval, timeout time.Dur
 		return false, nil
 	}
 
-	return waitForPodCondition(c, ns, podName, condition, interval, timeout)
+	quit := progress("...", ticker)
+	err := waitForPodCondition(c, ns, podName, condition, interval, timeout)
+	quit <- true
+	<-quit
+	return err
 }
 
 // waitForPodEnd waits for a pod in state succeeded or failed
@@ -222,3 +226,21 @@ func waitForPodCondition(c *client.Client, ns, podName string, condition func(po
 		return false, nil
 	})
 }
+
+func progress(msg string, interval time.Duration) chan bool {
+	tick := time.Tick(interval)
+	quit := make(chan bool)
+	go func() {
+		for {
+			select {
+			case <-quit:
+				close(quit)
+				return
+			case <-tick:
+				fmt.Println(msg)
+			default:
+			}
+		}
+	}()
+	return quit
+}