DaemonCli: Move check into startMetricsServer#39904
Merged
Merged
Conversation
thaJeztah
requested changes
Sep 11, 2019
Member
thaJeztah
left a comment
thaJeztah
left a comment
There was a problem hiding this comment.
Thanks! I left some comments inline 👍
thaJeztah
added
status/2-code-review
kind/experimental
and removed
status/0-triage
labels
yedamao
force-pushed
the
start-metrics-server
branch
from
62660de to
ef67aa4
Compare
Contributor
Author
|
@thaJeztah Thanks your suggestion. please review again |
thaJeztah
requested changes
Sep 12, 2019
Member
thaJeztah
left a comment
thaJeztah
left a comment
There was a problem hiding this comment.
thank you!
changes LGTM, but could you squash the commits so that there's only a single commit in this PR?
(let me know if you need help squashing 👍)
Fix TODO: move into startMetricsServer() Fix errors.Wrap return nil when passed err is nil Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com> Signed-off-by: HuanHuan Ye <logindaveye@gmail.com>
yedamao
force-pushed
the
start-metrics-server
branch
from
e09cb16 to
88c554f
Compare
Contributor
Author
|
all commits squashed |
Member
|
@cpuguy83 ptal |
This was referenced Jan 25, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix TODO: move into startMetricsServer()
Fix errors.Wrap return nil when passed err is nil
Signed-off-by: HuanHuan Ye logindaveye@gmail.com
- What I did
In DaemonCli.start() method.
fix TODO move startMetricsServer prepare check into startMetricsServer()
fix return nil when daemon not HasExperimental
- How I did it
change function startMetricsServer() to DaemonCli's method
use errors.New() replace errors.Wrap()
- How to verify it
./bundles/binary-daemon/dockerd-dev --metrics-addr 0.0.0.0:7878 -D- Description for the changelog
DaemonCli: Move check into startMetricsServer
- A picture of a cute animal (not mandatory but encouraged)