Skip to content
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

Jump to bottom

Support JSON logging #328

Merged
merged 4 commits into from
Jul 28, 2020
Merged

Support JSON logging #328

merged 4 commits into from
Jul 28, 2020

Conversation

ustuzhanin
Copy link

Issue #326

@ustuzhanin
Copy link
Author

@jacksontj

jacksontj
jacksontj reviewed Jul 17, 2020
View reviewed changes
Copy link
Owner

@jacksontj jacksontj left a comment

Choose a reason for hiding this comment

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

Thanks for the PR! some minor comments in the review, but should be easy to merge

cmd/promxy/main.go Show resolved Hide resolved
cmd/promxy/main.go Outdated Show resolved Hide resolved
@ustuzhanin
Copy link
Author

access log is also needed in json, but this is apparently a separate change

@jacksontj
Copy link
Owner

@ustuzhanin yea, the access logging is a separate logger so it would require another change.

This PR seems fine, although it apparently needs a rebase (github is complaining about a conflict); once thats sorted I'll merge it in :)

Устюжанин Антон Александрович added 2 commits July 26, 2020 00:12
@ustuzhanin
Copy link
Author

@jacksontj

@jacksontj jacksontj merged commit 3506c43 into jacksontj:master Jul 28, 2020
@jacksontj
Copy link
Owner

@ustuzhanin thanks for the contribution! :)

@jacksontj jacksontj mentioned this pull request Jul 28, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jacksontj jacksontj jacksontj left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ustuzhanin @jacksontj