Skip to content

Add newlines to SkaffoldLogEvents that come from logrus #6506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 24, 2021
Merged

Add newlines to SkaffoldLogEvents that come from logrus #6506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/skaffold/build/cache/retrieve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func (c *cache) Build(ctx context.Context, out io.Writer, tags tag.ImageTags, ar
})
}

log.Entry(ctx).Info("Cache check completed in", util.ShowHumanizeTime(time.Since(start)))
log.Entry(ctx).Infoln("Cache check completed in", util.ShowHumanizeTime(time.Since(start)))
Copy link
Contributor

@aaron-prindle aaron-prindle Aug 24, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Are there any integration/unit tests that verify the form of a log entries? Might be helpful if Cloud Code relies on them

Copy link
Contributor Author

@MarlonGamez MarlonGamez Aug 24, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We currently don't really have any testing for most things output related I believe. This would be good to have in the future and I think that having the API Server now will help a lot with that since we can connect to the server and check output through there rather than parsing output from the terminal. I'd like to add this is a follow up


bRes, err := buildAndTest(ctx, out, tags, needToBuild)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/skaffold/event/v2/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func (h logHook) Fire(entry *logrus.Entry) error {
TaskId: fmt.Sprintf("%s-%d", task, handler.iteration),
SubtaskId: fmt.Sprintf("%s", subtask),
Level: levelFromEntry(entry),
Message: entry.Message,
Message: fmt.Sprintf("%s\n", entry.Message),
})
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/skaffold/runner/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ func (r *Builder) imageTags(ctx context.Context, out io.Writer, artifacts []*lat
output.Yellow.Fprintln(out, "Some taggers failed. Rerun with -vdebug for errors.")
}

log.Entry(ctx).Info("Tags generated in", util.ShowHumanizeTime(time.Since(start)))
log.Entry(ctx).Infoln("Tags generated in", util.ShowHumanizeTime(time.Since(start)))
return imageTags, nil
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/skaffold/runner/v1/dev.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ func (r *SkaffoldRunner) Dev(ctx context.Context, out io.Writer, artifacts []*la
return fmt.Errorf("watching skaffold configuration %q: %w", r.runCtx.ConfigurationFile(), err)
}

log.Entry(ctx).Info("List generated in", util.ShowHumanizeTime(time.Since(start)))
log.Entry(ctx).Infoln("List generated in", util.ShowHumanizeTime(time.Since(start)))

// Init Sync State
if err := sync.Init(ctx, artifacts); err != nil {
Expand Down