commit 7e0d7ed2cbd69738a96c9d72e0e30521a0021d28
author Paul Hobbs <phobbs@google.com> Mon Apr 24 12:14:05 2017 -0700
committer chrome-bot <chrome-bot@chromium.org> Tue Apr 25 18:40:03 2017 -0700
tree 0081b6765a04a3ca64517f3d714c61b1e6beac38
parent b3b206f919b133ce2031ee6c00d44063a9ede7a3

apache_error_stats: Fix to constant and logging

- Fix a bug in the PATTERNS constant, which should be a list of tuples
  instead of a dictionary.
- Change the matching loop to only log that a message is being emitted
  if the .match result is not None.

BUG=chromium:712388
TEST=None

Change-Id: Ic9eb0ddb025006cc89c753f1cc576919aee358c9
Reviewed-on: https://chromium-review.googlesource.com/486121
Commit-Ready: Paul Hobbs <phobbs@google.com>
Tested-by: Paul Hobbs <phobbs@google.com>
Reviewed-by: Aviv Keshet <akeshet@chromium.org>

site_utils/stats/apache_error_stats.py

diff --git a/site_utils/stats/apache_error_stats.py b/site_utils/stats/apache_error_stats.py
index 8404ef3..0f5fb7c 100755
--- a/site_utils/stats/apache_error_stats.py
+++ b/site_utils/stats/apache_error_stats.py
@@ -53,9 +53,9 @@
       'mod_wsgi': mod_wsgi_present})
 
 
-MATCHERS = {
-    ERROR_LOG_MATCHER: EmitErrorLogMetric,
-}
+MATCHERS = [
+    (ERROR_LOG_MATCHER, EmitErrorLogMetric),
+]
 
 
 def RunMatchers(stream, matchers):
@@ -70,10 +70,10 @@
     with contextlib.closing(ts_mon):
         for line in iter(stream.readline, ''):
             for matcher, emitter in matchers:
-                logging.debug('Emitting %s for input "%s"',
-                              emitter.__name__, line.strip())
                 m = matcher.match(line)
                 if m:
+                    logging.debug('Emitting %s for input "%s"',
+                                  emitter.__name__, line.strip())
                     emitter(m)