From 4802210df8dd987b3e9ea42d1023d756e33739e2 Mon Sep 17 00:00:00 2001 From: pengtao Date: Mon, 25 Nov 2019 15:08:34 +0800 Subject: [PATCH] fixbug --- daily_report/dreport.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/daily_report/dreport.py b/daily_report/dreport.py index e59098b..34ce20e 100644 --- a/daily_report/dreport.py +++ b/daily_report/dreport.py @@ -554,6 +554,7 @@ class TapWeeklyReport: def collect_tags(self, data): row_tags = dict() + new_data=dict() for line in data: try: data_type = line.get("name") @@ -561,18 +562,17 @@ class TapWeeklyReport: for items in line.get("row_data"): for tag in items[-1].split(','): row_tags[data_type][tag] = row_tags[data_type].get(tag, 0) + 1 + pdb.set_trace() + new_tags = sorted(row_tags[data_type].items(), key=lambda d: d[1]) + for key in new_tags: + new_data[data_type] = {} + new_data[data_type][key] = list() + for i in range(0, 3): + temp = {} + temp[new_tags[key].keys()[i]] = new_tags[new_tags[key].keys()[i]] + new_data[key].append(temp) except Exception: log.error(f"collect tags failed with {line}", exc_info=True) - new_data = {} - if row_tags: - new_tags = sorted(row_tags.items(), key=lambda d: d[1]) - pdb.set_trace() - for key in new_tags: - new_data[key] = list() - for i in range(0, 3): - temp = {} - temp[new_tags[key].keys()[i]] = new_tags[new_tags[key].keys()[i]] - new_data[key].append(temp) return new_data