Merge pull request #1142 from nkubala/logs

Minor logging improvements
GoogleContainerTools · Oct 11, 2018 · d4912b7 · d4912b7
2 parents e73775c + 306348d
commit d4912b7
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/pkg/skaffold/bazel/bazel.go b/pkg/skaffold/bazel/bazel.go
@@ -27,6 +27,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 )
 
 const sourceQuery = "kind('source file', deps('%[1]s')) union buildfiles('%[1]s')"
@@ -65,6 +66,8 @@ func GetDependencies(ctx context.Context, workspace string, a *latest.BazelArtif
 		deps = append(deps, "WORKSPACE")
 	}
 
+	logrus.Debugf("Found dependencies for bazel artifact: %v", deps)
+
 	return deps, nil
 }
 

diff --git a/pkg/skaffold/docker/parse.go b/pkg/skaffold/docker/parse.go
@@ -249,7 +249,7 @@ func expandPaths(workspace string, copied [][]string) ([]string, error) {
 	for dep := range expandedPaths {
 		deps = append(deps, dep)
 	}
-	logrus.Infof("Found dependencies for dockerfile %s", deps)
+	logrus.Debugf("Found dependencies for dockerfile: %v", deps)
 
 	return deps, nil
 }

diff --git a/pkg/skaffold/jib/jib_gradle.go b/pkg/skaffold/jib/jib_gradle.go
@@ -24,6 +24,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 )
 
 var GradleCommand = util.CommandWrapper{Executable: "gradle", Wrapper: "gradlew"}
@@ -36,6 +37,7 @@ func GetDependenciesGradle(ctx context.Context, workspace string, a *latest.JibG
 	if err != nil {
 		return nil, errors.Wrapf(err, "getting jibGradle dependencies")
 	}
+	logrus.Debugf("Found dependencies for jibGradle artifact: %v", deps)
 	return deps, nil
 }
 

diff --git a/pkg/skaffold/jib/jib_maven.go b/pkg/skaffold/jib/jib_maven.go
@@ -23,6 +23,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 )
 
 var MavenCommand = util.CommandWrapper{Executable: "mvn", Wrapper: "mvnw"}
@@ -38,6 +39,7 @@ func GetDependenciesMaven(ctx context.Context, workspace string, a *latest.JibMa
 	if err != nil {
 		return nil, errors.Wrapf(err, "getting jibMaven dependencies")
 	}
+	logrus.Debugf("Found dependencies for jibMaven artifact: %v", deps)
 	return deps, nil
 }
 

diff --git a/pkg/skaffold/watch/changes.go b/pkg/skaffold/watch/changes.go
@@ -105,13 +105,25 @@ func events(prev, curr FileMap) Events {
 		}
 	}
 
-	sortEvt(e)
-	logrus.Debug(e.String())
+	sortEvents(e)
+	logEvents(e)
 	return e
 }
 
-func sortEvt(e Events) {
+func sortEvents(e Events) {
 	sort.Strings(e.Added)
 	sort.Strings(e.Modified)
 	sort.Strings(e.Deleted)
 }
+
+func logEvents(e Events) {
+	if e.Added != nil && len(e.Added) > 0 {
+		logrus.Infof("files added: %v", e.Added)
+	}
+	if e.Modified != nil && len(e.Modified) > 0 {
+		logrus.Infof("files modified: %v", e.Modified)
+	}
+	if e.Deleted != nil && len(e.Deleted) > 0 {
+		logrus.Infof("files deleted: %v", e.Deleted)
+	}
+}