commit 487e38108897fcccae2f84757b2aab34abaa25fe
author Paul Hobbs <phobbs@google.com> Fri Jul 22 15:45:33 2016 -0700
committer Paul Hobbs <phobbs@google.com> Fri Jul 22 23:04:05 2016 +0000
tree 001f940d6f664aa456949d408157336f261d26e3
parent f8b1019f4f7f498ad2cb3c077fcc895570308370

apache_log_metrics.py: Fix "ip_addr" group match

A bug was introduced by switching to named regex match groups - the
ip_addr group was referenced as "ipaddr".

BUG=chromium:630776
TEST=added a unit test.

Change-Id: I6a51c2c18aeffc2fbda53446c5e5690ae53060cc
Reviewed-on: https://chromium-review.googlesource.com/362588
Reviewed-by: Richard Barnette <jrbarnette@google.com>
Tested-by: Paul Hobbs <phobbs@google.com>

apache_log_metrics.py

diff --git a/apache_log_metrics.py b/apache_log_metrics.py
index 0d35d09..e94edd6 100755
--- a/apache_log_metrics.py
+++ b/apache_log_metrics.py
@@ -52,7 +52,7 @@
   Args:
     ip: An IPv4-formatted string.
   """
-  return reduce(lambda (seed, x): seed * 2**8 + int(x),
+  return reduce(lambda seed, x: seed * 2**8 + int(x),
                 ip.split('.'),
                 0)
 
@@ -124,7 +124,7 @@
       size, fields={
           'build_config': build_config,
           'milestone': milestone,
-          'in_lab': InLab(m.group('ipaddr')),
+          'in_lab': InLab(m.group('ip_addr')),
           'endpoint': filename})