Merge pull request #2592 from nkubala/unmute-logs

Make sure we mute/unmute logs at the correct times

Author: balopat

pkg/skaffold/kubernetes/log.go

@@ -142,7 +142,7 @@ func sinceSeconds(d time.Duration) int64 {
 }
 
 func (a *LogAggregator) streamContainerLogs(ctx context.Context, pod *v1.Pod, container v1.ContainerStatus) {
-	logrus.Infof("Stream logs from pod: %s container: %s", pod.Name, container.Name)
+	logrus.Infof("Streaming logs from pod: %s container: %s", pod.Name, container.Name)
 
 	// In theory, it's more precise to use --since-time='' but there can be a time
 	// difference between the user's machine and the server.

pkg/skaffold/runner/dev.go

@@ -34,14 +34,15 @@ import (
 var ErrorConfigurationChanged = errors.New("configuration changed")
 
 func (r *SkaffoldRunner) doDev(ctx context.Context, out io.Writer) error {
-	r.logger.Mute()
+	actionPerformed := false
 
 	// acquire the intents
 	buildIntent, syncIntent, deployIntent := r.intents.GetIntents()
 
 	if (r.changeSet.needsRedeploy && deployIntent) ||
 		(len(r.changeSet.needsRebuild) > 0 && buildIntent) ||
 		(len(r.changeSet.needsResync) > 0 && syncIntent) {
+		r.logger.Mute()
 		// if any action is going to be performed, reset the monitor's changed component tracker for debouncing
 		defer r.monitor.Reset()
 		defer r.listener.LogWatchToUser(out)
@@ -56,6 +57,7 @@ func (r *SkaffoldRunner) doDev(ctx context.Context, out io.Writer) error {
 			r.changeSet.resetSync()
 			r.intents.resetSync()
 		}()
+		actionPerformed = true
 		for _, s := range r.changeSet.needsResync {
 			color.Default.Fprintf(out, "Syncing %d files for %s\n", len(s.Copy)+len(s.Delete), s.Image)
 
@@ -70,6 +72,9 @@ func (r *SkaffoldRunner) doDev(ctx context.Context, out io.Writer) error {
 			r.changeSet.resetBuild()
 			r.intents.resetBuild()
 		}()
+		// this linter apparently doesn't understand fallthroughs
+		//nolint:ineffassign
+		actionPerformed = true
 		if _, err := r.BuildAndTest(ctx, out, r.changeSet.needsRebuild); err != nil {
 			r.changeSet.reset()
 			logrus.Warnln("Skipping deploy due to error:", err)
@@ -83,6 +88,7 @@ func (r *SkaffoldRunner) doDev(ctx context.Context, out io.Writer) error {
 			r.logger.Unmute()
 			return nil
 		}
+		actionPerformed = true
 		r.forwarderManager.Stop()
 		defer func() {
 			r.changeSet.reset()
@@ -97,7 +103,9 @@ func (r *SkaffoldRunner) doDev(ctx context.Context, out io.Writer) error {
 		}
 	}
 
-	r.logger.Unmute()
+	if actionPerformed {
+		r.logger.Unmute()
+	}
 	return nil
 }