Skip to content

Commit 7d985fe

Browse files
committed
fix per node and aggrgate log errors
1 parent 2d48942 commit 7d985fe

File tree

3 files changed

+58
-26
lines changed

3 files changed

+58
-26
lines changed

scripts/print_aggregated_errors.py

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -193,19 +193,21 @@ def print_all_errors():
193193
publisher_get_error = attempt_data.get('publisher_get_error')
194194
non_publisher_get_error = attempt_data.get('non_publisher_get_error')
195195

196-
# Show which errors occurred for this attempt
197-
error_types = []
196+
# Show actual error messages for each error type
197+
error_lines = []
198198
if publish_error:
199-
error_types.append("publish")
199+
error_lines.append(f" • publishing — {publish_error}")
200200
if query_error:
201-
error_types.append("query")
201+
error_lines.append(f" • querying — {query_error}")
202202
if publisher_get_error:
203-
error_types.append("local get")
203+
error_lines.append(f" • local get{publisher_get_error}")
204204
if non_publisher_get_error:
205-
error_types.append("remote get")
205+
error_lines.append(f" • remote get{non_publisher_get_error}")
206206

207-
if error_types:
208-
print(f" • {ka_label} (attempt {attempt_number}): {', '.join(error_types)} errors")
207+
if error_lines:
208+
print(f" • {ka_label} (attempt {attempt_number}):")
209+
for line in error_lines:
210+
print(line)
209211
else:
210212
print(f" • {ka_label} (attempt {attempt_number}): no errors")
211213
else:
@@ -229,8 +231,34 @@ def print_error_for_node():
229231
if not errors:
230232
print(" ✅ No errors\n")
231233
else:
232-
for error_key, count in errors.items():
233-
print(f" • {count}x {error_key}")
234+
for attempt_key, attempt_data in errors.items():
235+
if isinstance(attempt_data, dict) and 'ka_label' in attempt_data:
236+
ka_label = attempt_data.get('ka_label', 'Unknown KA')
237+
attempt_number = attempt_data.get('attempt', 1)
238+
publish_error = attempt_data.get('publish_error')
239+
query_error = attempt_data.get('query_error')
240+
publisher_get_error = attempt_data.get('publisher_get_error')
241+
non_publisher_get_error = attempt_data.get('non_publisher_get_error')
242+
243+
error_lines = []
244+
if publish_error:
245+
error_lines.append(f" • publishing — {publish_error}")
246+
if query_error:
247+
error_lines.append(f" • querying — {query_error}")
248+
if publisher_get_error:
249+
error_lines.append(f" • local get — {publisher_get_error}")
250+
if non_publisher_get_error:
251+
error_lines.append(f" • remote get — {non_publisher_get_error}")
252+
253+
if error_lines:
254+
print(f" • {ka_label} (attempt {attempt_number}):")
255+
for line in error_lines:
256+
print(line)
257+
else:
258+
print(f" • {ka_label} (attempt {attempt_number}): no errors")
259+
else:
260+
count = attempt_data if isinstance(attempt_data, int) else 1
261+
print(f" • {count}x {attempt_key}")
234262
print()
235263

236264
if __name__ == "__main__":

tests/mainnet/conftest.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -187,19 +187,21 @@ def avg_time(times):
187187
publisher_get_error = attempt_data.get('publisher_get_error')
188188
non_publisher_get_error = attempt_data.get('non_publisher_get_error')
189189

190-
# Show which errors occurred for this attempt
191-
error_types = []
190+
# Show actual error messages for each error type
191+
error_lines = []
192192
if publish_error:
193-
error_types.append("publish")
193+
error_lines.append(f" • publishing — {publish_error}")
194194
if query_error:
195-
error_types.append("query")
195+
error_lines.append(f" • querying — {query_error}")
196196
if publisher_get_error:
197-
error_types.append("local get")
197+
error_lines.append(f" • local get{publisher_get_error}")
198198
if non_publisher_get_error:
199-
error_types.append("remote get")
199+
error_lines.append(f" • remote get{non_publisher_get_error}")
200200

201-
if error_types:
202-
print(f" • {ka_label} (attempt {attempt_number}): {', '.join(error_types)} errors")
201+
if error_lines:
202+
print(f" • {ka_label} (attempt {attempt_number}):")
203+
for line in error_lines:
204+
print(line)
203205
else:
204206
print(f" • {ka_label} (attempt {attempt_number}): no errors")
205207
else:

tests/testnet/conftest.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -188,19 +188,21 @@ def avg_time(times):
188188
publisher_get_error = attempt_data.get('publisher_get_error')
189189
non_publisher_get_error = attempt_data.get('non_publisher_get_error')
190190

191-
# Show which errors occurred for this attempt
192-
error_types = []
191+
# Show actual error messages for each error type
192+
error_lines = []
193193
if publish_error:
194-
error_types.append("publish")
194+
error_lines.append(f" • publishing — {publish_error}")
195195
if query_error:
196-
error_types.append("query")
196+
error_lines.append(f" • querying — {query_error}")
197197
if publisher_get_error:
198-
error_types.append("local get")
198+
error_lines.append(f" • local get{publisher_get_error}")
199199
if non_publisher_get_error:
200-
error_types.append("remote get")
200+
error_lines.append(f" • remote get{non_publisher_get_error}")
201201

202-
if error_types:
203-
print(f" • {ka_label} (attempt {attempt_number}): {', '.join(error_types)} errors")
202+
if error_lines:
203+
print(f" • {ka_label} (attempt {attempt_number}):")
204+
for line in error_lines:
205+
print(line)
204206
else:
205207
print(f" • {ka_label} (attempt {attempt_number}): no errors")
206208
else:

0 commit comments

Comments
 (0)