diff options
| author | 2017-12-06 20:14:21 +0000 | |
|---|---|---|
| committer | 2017-12-06 20:14:21 +0000 | |
| commit | 43be09b58c6ec3009f0eb9cb0c904edbd81b23b5 (patch) | |
| tree | f2be452cca6a3a136f178d7e82601b208a0e7ad1 | |
| parent | 8bb6da69ee9c6631fe76e54574a677a452c7faa5 (diff) | |
| parent | 16c8c6ab6fd0be70f64e169c35d0a6ba36c20937 (diff) | |
Merge "Make matchesSimple return false if there is a parsing error"
| -rw-r--r-- | cmds/statsd/src/matchers/matcher_util.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/cmds/statsd/src/matchers/matcher_util.cpp b/cmds/statsd/src/matchers/matcher_util.cpp index 534d54eb0bea..9e88e5d0d8e3 100644 --- a/cmds/statsd/src/matchers/matcher_util.cpp +++ b/cmds/statsd/src/matchers/matcher_util.cpp @@ -117,6 +117,9 @@ bool matchesSimple(const SimpleAtomMatcher& simpleMatcher, const LogEvent& event allMatched = false; break; } + } else { + allMatched = false; + break; } } else if (matcherCase == KeyValueMatcher::ValueMatcherCase::kEqInt || matcherCase == KeyValueMatcher::ValueMatcherCase::kLtInt || @@ -153,6 +156,9 @@ bool matchesSimple(const SimpleAtomMatcher& simpleMatcher, const LogEvent& event break; } } + } else { + allMatched = false; + break; } } else if (matcherCase == KeyValueMatcher::ValueMatcherCase::kEqBool) { // Boolean fields @@ -163,6 +169,9 @@ bool matchesSimple(const SimpleAtomMatcher& simpleMatcher, const LogEvent& event allMatched = false; break; } + } else { + allMatched = false; + break; } } else if (matcherCase == KeyValueMatcher::ValueMatcherCase::kLtFloat || matcherCase == KeyValueMatcher::ValueMatcherCase::kGtFloat) { @@ -181,6 +190,9 @@ bool matchesSimple(const SimpleAtomMatcher& simpleMatcher, const LogEvent& event break; } } + } else { + allMatched = false; + break; } } else { // If value matcher is not present, assume that we match. |