continue processing on failure

mlapaglia · Jul 1, 2021 · 9b540a2 · 9b540a2
1 parent a340aa9
commit 9b540a2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/OpenAlprWebhookProcessor/Alerts/AlertService.cs b/OpenAlprWebhookProcessor/Alerts/AlertService.cs
@@ -81,20 +81,29 @@ private async Task ProcessAlertsAsync()
                         plateGroups = plateGroups.Where(x => x.Id == job.LicensePlateId);
                     }
 
-                    var result = await plateGroups.FirstOrDefaultAsync();
+                    var result = await plateGroups.FirstOrDefaultAsync(_cancellationTokenSource.Token);
 
                     if (result != null)
                     {
                         _logger.LogInformation($"alerting for: {result.Id}");
                         await _processorHub.Clients.All.LicensePlateAlerted(result.Id.ToString());
-                        await _alertClient.SendAlertAsync(new Alert()
+
+                        try
+                        {
+                            await _alertClient.SendAlertAsync(new Alert()
+                            {
+                                Description = result.AlertDescription.ToString(),
+                                Id = result.Id,
+                                PlateNumber = result.BestNumber.ToString(),
+                            },
+                            result.Jpeg,
+                            _cancellationTokenSource.Token);
+                        }
+                        catch (Exception ex)
                         {
-                            Description = result.AlertDescription.ToString(),
-                            Id = result.Id,
-                            PlateNumber = result.BestNumber.ToString(),
-                        },
-                        result.Jpeg,
-                        _cancellationTokenSource.Token);
+                            _logger.LogError(ex, $"failed to send alert to {nameof(_alertClient)}");
+                        }
+
                     }
                 }
             }

diff --git a/OpenAlprWebhookProcessor/Alerts/Pushover/PushoverClient.cs b/OpenAlprWebhookProcessor/Alerts/Pushover/PushoverClient.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -45,7 +44,7 @@ public async Task SendAlertAsync(
                     content.Add(new StringContent(alert.PlateNumber + " " + alert.Description), "message");
                     content.Add(new StringContent("openalpr alert"), "title");
 
-                    if(clientSettings.SendPlatePreview)
+                    if (clientSettings.SendPlatePreview)
                     {
                         content.Add(new ByteArrayContent(Convert.FromBase64String(base64PreviewJpeg)), "attachment", "attachment.jpg");
                     }