Merge lp:~hloeung/ubuntu-repository-cache/metadata-sync-failure-output-timestamp into lp:ubuntu-repository-cache

[Haw Loeung]

Add timestamp on output, useful for cron emails

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Loïc Gomez (kotodama)]

+1
You might want to move the formatting to a method if you expect more error logging later

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 370

=== modified file 'lib/ubuntu_repository_cache/metadata_sync.py'
--- lib/ubuntu_repository_cache/metadata_sync.py	2022-08-15 23:25:32 +0000
+++ lib/ubuntu_repository_cache/metadata_sync.py	2022-08-15 23:49:06 +0000
@@ -297,7 +297,7 @@
     label = 'meta_ver={}'.format(meta_ver)
     failures = 0
 
-    errors = []
+    errmsgs = []
     # Work around Juju instability issues causing juju-run to abort
     # (LP:1977798).
     max_retries = 10
@@ -316,18 +316,18 @@
             msg = "Attempt {} failed, sleeping {} - retrying with {}".format(attempt, sleep, meta_ver)
             log(msg)
             log(e.output.decode())
-            errors.append(msg)
-            errors.append(e.output.decode())
+            errmsgs.append("{}: {}".format(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"), msg))
+            errmsgs.append(e.output.decode())
             time.sleep(sleep)
         else:
             break
     else:
         # Exhausted all available attempts, let's re-raise the
         # exception.
-        msg = "Failed after all available attempts with {}".format(meta_ver)
+        msg = "Failed after all available attempts ({}) with {}".format(max_retries, meta_ver)
         log(msg)
-        print(msg)
-        print('\n'.join(errors))
+        print("{}: {}".format(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"), msg))
+        print('\n'.join(errmsgs))
         send_to_influx(render_influx(metric_name, label, max_retries))
         raise exp