[config] Fix _is_affirmative when passed argument is None
#3063
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
Return `False` in that case instead of raising an exception.
degemer
approved these changes
Dec 6, 2016
| @@ -222,6 +222,8 @@ def _checksd_path(directory): | |||
|
|
|||
|
|
|||
| def _is_affirmative(s): | |||
| if s is None: | |||
There was a problem hiding this comment.
return s is None or isinstance(s, int) and bool(s) or s.lower() in ('yes', 'true', '1')
There was a problem hiding this comment.
I agree but for some reason I find things more readable the way they are, so I'll ignore this
There was a problem hiding this comment.
especially that @degemer 's version is wrong. It would return True if s is None ..
degemer
added a commit
that referenced
this pull request
Dec 21, 2016
* master: (53 commits) [nginx] Update example config [service_discovery] Add a Zookeeper service discovery implementation. [aggregator] if sample rate is bad, fix it but still parse tags. (#3073) [yarn] whitelist authorized application_tags Alex poe/update jmx with refresh beans (#3068) [config] Fix `_is_affirmative` when passed argument is `None` (#3063) Send all configured tags with process checks. (#2976) fix flake8 errors [flare] ignore whitespace before proxy credentials [core] add a switch to disable profiling, but still use developer mode (#2898) [tests] allow tests to use the additional_checksd parameter (#3056) [service_discovery][jmx] trying to pick-up JMX changes with SD. (#3010) [install_script] Make `dd-agent` group of `datadog.conf` (#3036) [postgres] Allow disable postgresql.database_size (#3035) [core] Fixes IndexError for process lookup (#3043) remove warning message leaking password strings (#3053) trap psutil.NoSuchProcess exception (#3052) Fix grammar and casing in exception text (#3050) allow override of kubelet host with KUBERNETES_KUBELET_HOST env var [service discovery] properly handle config reload for removed containers ...
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 does this PR do?
Avoid raising exception when passed argument to
_is_affirmativeisNone.Return
Falsein that case instead of raising an exception.For instance #3010 introduced a case where the passed argument is
None, which would make the whole collector fail. #3010 should not be released without this fixMotivation
Fix stuff
Testing Guidelines
It works.
Returning
Falsedoesn't break backwards compatibility because that made the code blow up before.Additional Notes
🤖