[ARVADOS] updated: 820ad7e2efc77d686bb2fa0fe0ca314f93845765

[Git user]

Summary of changes:
 tools/crunchstat-summary/crunchstat_summary/summarizer.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

       via  820ad7e2efc77d686bb2fa0fe0ca314f93845765 (commit)
       via  f2060a005a084ff544d9479ea50bb8a02fe6a31d (commit)
       via  62387cc99cafcbca47983b8e1666f56533827a84 (commit)
      from  9aff8a3624b463d3fd4d9302c4d41c7558df4a13 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 820ad7e2efc77d686bb2fa0fe0ca314f93845765
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Sep 8 10:05:34 2017 -0400

    10472: Fix logging format.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/tools/crunchstat-summary/crunchstat_summary/summarizer.py b/tools/crunchstat-summary/crunchstat_summary/summarizer.py
index da1f4ac..17af9c7 100644
--- a/tools/crunchstat-summary/crunchstat_summary/summarizer.py
+++ b/tools/crunchstat-summary/crunchstat_summary/summarizer.py
@@ -182,9 +182,10 @@ class Summarizer(object):
                         else:
                             stats[stat] = int(val)
                 except ValueError as e:
-                    logger.warning('Error parsing value "{}" for stat "{}" in category "{}": {!r}'.format(
-                        val, stat, category, e))
-                    logger.warning(line)
+                    logger.warning(
+                        'Error parsing value %r (stat %r, category %r): %r',
+                        val, stat, category, e)
+                    logger.warning('%s', line)
                     continue
                 if 'user' in stats or 'sys' in stats:
                     stats['user+sys'] = stats.get('user', 0) + stats.get('sys', 0)

commit f2060a005a084ff544d9479ea50bb8a02fe6a31d
Merge: 9aff8a3 62387cc
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Sep 8 09:52:32 2017 -0400

    12221: Merge branch '12221-crunchstat-summary-valueerror'
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --cc tools/crunchstat-summary/crunchstat_summary/summarizer.py
index 6552708,613fd65..da1f4ac
--- a/tools/crunchstat-summary/crunchstat_summary/summarizer.py
+++ b/tools/crunchstat-summary/crunchstat_summary/summarizer.py
@@@ -132,9 -128,9 +132,9 @@@ class Summarizer(object)
              if m.group('category').endswith(':'):
                  # "stderr crunchstat: notice: ..."
                  continue
-             elif m.group('category') in ('error', 'caught', 'Running'):
+             elif m.group('category') in ('error', 'caught'):
                  continue
-             elif m.group('category') in ['read', 'open', 'cgroup', 'CID']:
 -            elif m.group('category') in ['read', 'open', 'cgroup', 'CID', 'Running']:
++            elif m.group('category') in ('read', 'open', 'cgroup', 'CID', 'Running'):
                  # "stderr crunchstat: read /proc/1234/net/dev: ..."
                  # (old logs are less careful with unprefixed error messages)
                  continue

-----------------------------------------------------------------------


hooks/post-receive
--