fix: improve logging

Author: FabianKramm

pkg/devspace/devpod/devpod.go

@@ -128,6 +128,7 @@ func (d *devPod) startWithRetry(ctx *devspacecontext.Context, devPodConfig *late
 
 		if ctx.IsDone() {
 			<-t.Dead()
+			ctx.Log.Debugf("Stopped dev %s", devPodConfig.Name)
 			close(d.done)
 			return
 		}
@@ -145,6 +146,7 @@ func (d *devPod) startWithRetry(ctx *devspacecontext.Context, devPodConfig *late
 				pod, err := ctx.KubeClient.KubeClient().CoreV1().Pods(selectedPod.Pod.Namespace).Get(ctx.Context, selectedPod.Pod.Name, metav1.GetOptions{})
 				if err != nil {
 					if kerrors.IsNotFound(err) {
+						ctx.Log.Debugf("Restart dev %s because pod isn't found anymore", devPodConfig.Name)
 						d.restart(ctx, devPodConfig, options)
 						return true, nil
 					}
@@ -153,6 +155,7 @@ func (d *devPod) startWithRetry(ctx *devspacecontext.Context, devPodConfig *late
 					ctx.Log.Debugf("error trying to retrieve pod: %v", err)
 					return false, nil
 				} else if pod.DeletionTimestamp != nil {
+					ctx.Log.Debugf("Restart dev %s because pod is terminating", devPodConfig.Name)
 					d.restart(ctx, devPodConfig, options)
 					return true, nil
 				}
@@ -168,6 +171,7 @@ func (d *devPod) startWithRetry(ctx *devspacecontext.Context, devPodConfig *late
 			}
 		}
 
+		ctx.Log.Debugf("Stopped dev %s", devPodConfig.Name)
 		d.m.Lock()
 		d.err = t.Err()
 		d.m.Unlock()
@@ -272,6 +276,7 @@ func (d *devPod) start(ctx *devspacecontext.Context, devPodConfig *latest.DevPod
 								time.Sleep(time.Second * 1)
 								_ = open.Start(url)
 								ctx.Log.Donef("Successfully opened %s", url)
+								return nil
 							}
 						}
 					}

pkg/devspace/services/attach/attach.go

@@ -73,7 +73,6 @@ func StartAttach(
 				return
 			}
 
-			ctx.Log.WriteString(logrus.InfoLevel, "\n")
 			ctx.Log.Infof("Restarting because: %s", err)
 			select {
 			case <-ctx.Context.Done():
@@ -83,6 +82,8 @@ func StartAttach(
 			err = StartAttach(ctx, devContainer, selector, stdout, stderr, stdin, parent)
 			return
 		}
+
+		ctx.Log.Debugf("Stopped attach")
 	}()
 
 	before := log.GetBaseInstance().GetLevel()

pkg/devspace/services/logs/logs.go

@@ -8,7 +8,6 @@ import (
 	"github.com/loft-sh/devspace/pkg/util/scanner"
 	"github.com/mgutz/ansi"
 	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
 	"io"
 	"time"
 )
@@ -40,16 +39,20 @@ func StartLogs(
 	defer func() {
 		if err != nil {
 			if ctx.IsDone() {
-				err = nil
 				return
 			}
 
-			ctx.Log.WriteString(logrus.InfoLevel, "\n")
 			ctx.Log.Infof("Restarting because: %s", err)
-			time.Sleep(time.Second * 3)
+			select {
+			case <-ctx.Context.Done():
+				return
+			case <-time.After(time.Second * 3):
+			}
 			err = StartLogs(ctx, devContainer, selector)
 			return
 		}
+
+		ctx.Log.Debugf("Stopped logs")
 	}()
 
 	containerObj, err := selector.WithContainer(devContainer.Container).SelectSingleContainer(ctx.Context, ctx.KubeClient, ctx.Log)

pkg/devspace/services/terminal/terminal.go

@@ -104,7 +104,6 @@ func StartTerminal(
 				return
 			}
 
-			ctx.Log.WriteString(logrus.InfoLevel, "\n")
 			ctx.Log.Infof("Restarting because: %s", err)
 			select {
 			case <-ctx.Context.Done():
@@ -114,6 +113,8 @@ func StartTerminal(
 			err = StartTerminal(ctx, devContainer, selector, stdout, stderr, stdin, parent)
 			return
 		}
+
+		ctx.Log.Debugf("Stopped terminal")
 	}()
 
 	command := getCommand(devContainer)