Merge pull request #56 from clearlydefined/roman/logging_fixes

Improve error handling and logging in blobstorage-backupdata
clearlydefined · Jun 12, 2024 · 0b22df2 · 0b22df2
2 parents f8cff80 + deb6314
commit 0b22df2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/tools/blobstorage-backupdata/BackupJob.cs b/tools/blobstorage-backupdata/BackupJob.cs
@@ -78,7 +78,9 @@ private async Task SaveData(
     {
         var retryPolicy = Policy
             .Handle<MongoConnectionException>()
+            .Or<MongoExecutionTimeoutException>()
             .Or<TimeoutException>()
+            .Or<AggregateException>()
             .WaitAndRetryAsync(new[]
             {
                 TimeSpan.FromSeconds(1),

diff --git a/tools/blobstorage-backupdata/Program.cs b/tools/blobstorage-backupdata/Program.cs
@@ -16,7 +16,21 @@ internal static void Main()
         ILogger logger = loggerFactory.CreateLogger(nameof(Program));
         logger.LogInformation("Backup job started.");
         var backupJob = CreateBackupJob(loggerFactory);
-        backupJob.ProcessJob().Wait();
+        try 
+        {
+            backupJob.ProcessJob().Wait();
+        }
+        catch (AggregateException ae)
+        {
+            foreach (var e in ae.InnerExceptions)
+            {
+                logger.LogError(e, "Backup job failed.");
+            }   
+        }
+        catch (Exception e)
+        {
+            logger.LogError(e, "Backup job failed.");
+        }
         logger.LogInformation("Backup job completed.");
     }