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.

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

Decouple logging concerns from Supervisor errors #6590

Merged
merged 4 commits into from Jun 6, 2019

Conversation

@christophermaier
Copy link
Contributor

commented May 24, 2019

Fixes #6585

@christophermaier christophermaier self-assigned this May 24, 2019

@chef-expeditor

This comment has been minimized.

Copy link

commented May 24, 2019

Hello christophermaier! Thanks for the pull request!

Here is what will happen next:

  1. Your PR will be reviewed by the maintainers.
  2. If everything looks good, one of them will approve it, and your PR will be merged.

Thank you for contributing!

@baumanj
Copy link
Member

left a comment

It looks like pretty much everything here is changing SupErrorError and removing sup_error!. If there's any other substantive changes, let me know and I'll give them more scrutiny.

components/sup/src/util/pkg.rs Outdated Show resolved Hide resolved

@christophermaier christophermaier force-pushed the cm/decouple-logging-from-errors branch from bcfee49 to 9d2eeac May 31, 2019

christophermaier added some commits May 23, 2019

Extract location and logkey information from Supervisor errors
This duplicates information that we could be getting from the logging
subsystem.

Signed-off-by: Christopher Maier <cmaier@chef.io>
Remove SupError and sup_error!
Without location and logkey information, there's no reason to have a
separate `SupError` or the accompanying `sup_error!` macro. Now we can
simplify.

Signed-off-by: Christopher Maier <cmaier@chef.io>
Clippy fixes
After removing `SupError`, there were some additional Clippy-related
tweaks to make. They're broken out into a separate commit for ease of
review.

Signed-off-by: Christopher Maier <cmaier@chef.io>
[PR Feedback] Reformat for readability
Turns out a bunch of these poorly-formatted comments were outdated.

Signed-off-by: Christopher Maier <cmaier@chef.io>

@christophermaier christophermaier force-pushed the cm/decouple-logging-from-errors branch from 9d2eeac to 83f6208 Jun 6, 2019

@christophermaier christophermaier merged commit fb638cc into master Jun 6, 2019

5 checks passed

DCO This commit has a DCO Signed-off-by
Details
buildkite/habitat-sh-habitat-master-verify Build #2172 passed (30 minutes, 6 seconds)
Details
buildkite/habitat-sh-habitat-master-website Build #2384 passed (1 minute, 46 seconds)
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
expeditor/config-validation Validated your Expeditor config file
Details

@christophermaier christophermaier deleted the cm/decouple-logging-from-errors branch Jun 6, 2019

chef-ci added a commit that referenced this pull request Jun 6, 2019

Update CHANGELOG.md with details from pull request #6590
Obvious fix; these changes are the result of automation not creative thinking.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.