[marathon] service checks and improvements #1296
Merged
Conversation
This file contains 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
|
Note: This is a replacement for #1266. I used git before being caffeinated and seem to've ruined my branch. :) |
gphat
changed the title
|
|
||
| if r.status_code != 200: | ||
| self.status_code_event(url, r, aggregation_key) | ||
| self.warning("Got %s when hitting %s" % (r.status_code, url)) | ||
| self.status_code_event(url, r) |
There was a problem hiding this comment.
This function does not exist anymore?
You may want to use r.raise_for_status() in the
try:
r = requests.get()
r.raise_for_status()
except timeout:
<service_check_criticial>
except httperror:
<service_check_criticial>
else:
<service_check_ok>`
above (don't know for marathon, but other 2XX status may be OK) and you can get rid of this extra if block.
There was a problem hiding this comment.
I didn't know about that. Thanks!
|
Updated with your feedback. Thanks for dealing with my dumb re-send of this. :P |
|
👍 |
LeoCavaille
added a commit
that referenced
this pull request
Jan 14, 2015
[marathon] service checks and improvements
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What's This Do?
After working on the just-merged etcd plugin for #1235 I wanted to take a look at the Marathon plugin. Looks like the key problem I saw was already fixed in #1240. While I was here I:
Thanks!
I appreciate you taking the time to look at this. If I can do anything to help a merge, let me know!