patched application logic #23

Author: zetroot

src/NTorSpectator.Observer/Mastodon/Reporter.cs

@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Options;
 using NTorSpectator.Observer.Services;
 using NTorSpectator.Services;
+using NTorSpectator.Services.Models;
 
 namespace NTorSpectator.Observer.Mastodon;
 
@@ -70,4 +71,17 @@ public async Task ReportCameUp(string siteUri)
         await _mastodonClient.Toot(new(sb.ToString()));
         _logger.LogInformation("Posted a new status about came up site");
     }
+
+    public async Task PublishReportData(Report report)
+    {
+        var sb = new StringBuilder();
+        sb.AppendFormat("Observed {0} sites up and {1} sites down.\n",
+            report.Observations.Count(x => x.IsAvailable),
+            report.Observations.Count(x => !x.IsAvailable));
+        sb.AppendFormat("Since previous report {0} sites came up, {1} gone down", 
+            report.Events.Count(x => x.Kind == AvailabilityEvent.EventType.Up),
+            report.Events.Count(x => x.Kind == AvailabilityEvent.EventType.Down));
+        await _mastodonClient.Toot(new(sb.ToString()));
+        _logger.LogInformation("New report published!");
+    }
 }

src/NTorSpectator.Observer/Services/SpectatorJob.cs

@@ -24,13 +24,15 @@ public class SpectatorJob : IJob
     private readonly ISitesCatalogue _sitesCatalogue;
     private readonly TorControlManager _torControl;
     private readonly ISiteObserver _siteObserver;
+    private readonly IReporter _reporter;
 
-    public SpectatorJob(ILogger<SpectatorJob> logger, ISitesCatalogue sitesCatalogue, TorControlManager torControl, ISiteObserver siteObserver)
+    public SpectatorJob(ILogger<SpectatorJob> logger, ISitesCatalogue sitesCatalogue, TorControlManager torControl, ISiteObserver siteObserver, IReporter reporter)
     {
         _logger = logger;
         _sitesCatalogue = sitesCatalogue;
         _torControl = torControl;
         _siteObserver = siteObserver;
+        _reporter = reporter;
     }
 
     public async Task Execute(IJobExecutionContext context)
@@ -42,6 +44,7 @@ public async Task Execute(IJobExecutionContext context)
         _logger.LogDebug("Got {Count} sites to observe", sites.Count);
 
         var siteQueue = new Queue<QueuedSite>(sites.Select(x => new QueuedSite(x, 0)));
+        var report = new Report();
         while(siteQueue.TryDequeue(out var queuedSite))
         {
             QueueLength.Set(siteQueue.Count);
@@ -63,8 +66,17 @@ public async Task Execute(IJobExecutionContext context)
                         continue;
                     }
                 }
-                _logger.LogDebug("Site seems to be up");
-                await _siteObserver.AddNewObservation(queuedSite.Site.SiteUri, observations.IsOk);
+
+                var observationModel = new Observation { SiteUri = queuedSite.Site.SiteUri, ObservedAt = DateTime.UtcNow, IsAvailable = observations.IsOk };
+                var maybeEvent = await _siteObserver.GenerateEvent(observationModel);
+                
+                report.Observations.Add(observationModel);
+                if (maybeEvent is { } siteEvent)
+                {
+                    _logger.LogDebug("Should report site state change");
+                    report.Events.Add(siteEvent);
+                }
+                
                 SiteStatus.WithLabels(queuedSite.Site.SiteUri).Set(observations.IsOk ? 1 : 0);
                 _logger.LogInformation("Site observed");
             }
@@ -74,6 +86,10 @@ public async Task Execute(IJobExecutionContext context)
             }
         }
         _logger.LogDebug("The queue is finally empty, observations finished");
+        await _siteObserver.SaveReport(report);
+        _logger.LogInformation("Report saved!");
+        await _reporter.PublishReportData(report);
+        _logger.LogInformation("Report published!");
         sw.Stop();
         TotalSessionDuration.Set(sw.ElapsedMilliseconds);
     }