improve code readability

DataDog · Jan 24, 2017 · 8d335a1 · 8d335a1
1 parent 088021b
commit 8d335a1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/checks.d/http_check.py b/checks.d/http_check.py
@@ -313,18 +313,19 @@ def send_status_down(loginfo, message):
             if content_match:
                 # r.text is the response content decoded by `requests`, of type `unicode`
                 content = r.text if type(content_match) is unicode else r.content
-                if not reverse_content_match and re.search(content_match, content, re.UNICODE):
-                    send_status_up("%s is found in return content" % content_match)
+                if re.search(content_match, content, re.UNICODE):
+                    if reverse_content_match:
+                        send_status_down("%s is found in return content with the reverse_content_match option" % content_match,
+                            'Content "%s" found in response with the reverse_content_match' % content_match)
+                    else:
+                        send_status_up("%s is found in return content" % content_match)
 
-                elif reverse_content_match and not re.search(content_match, content, re.UNICODE):
-                    send_status_up("%s is not found in return content with the reverse_content_match option" % content_match)
-
-                elif reverse_content_match:
-                    send_status_down("%s is found in return content with the reverse_content_match option" % content_match,
-                        'Content "%s" found in response with the reverse_content_match' % content_match)
                 else:
-                    send_status_down("%s is not found in return content" % content_match,
-                        'Content "%s" not found in response.' % content_match)
+                    if reverse_content_match:
+                        send_status_up("%s is not found in return content with the reverse_content_match option" % content_match)
+                    else:
+                        send_status_down("%s is not found in return content" % content_match,
+                            'Content "%s" not found in response.' % content_match)
 
             else:
                 send_status_up("%s is UP" % addr)

diff --git a/conf.d/http_check.yaml.example b/conf.d/http_check.yaml.example
@@ -31,7 +31,7 @@ instances:
 
     # The (optional) reverse_content_match parameter will allow the content_match
     # to work the other way around. That means that the check will report
-    # as DOWN if the string is DOWN
+    # as DOWN if the string is found.
     # reverse_content_match: false
 
     # If your service uses basic authentication, you can optionally