Skip to content

Commit 7d94e63

Browse files
committed
Fixed logging a bit #20
1 parent bd34ed3 commit 7d94e63

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/NTorSpectator.Observer/Services/SpectatorJob.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,15 @@ public SpectatorJob(ILogger<SpectatorJob> logger, ISitesCatalogue sitesCatalogue
2222

2323
public async Task Execute(IJobExecutionContext context)
2424
{
25+
_logger.LogDebug("Starting sites observations");
2526
var sites = await _sitesCatalogue.GetAllSites();
26-
var siteQueue = new Queue<QueuedSite>(sites.Select(x => new QueuedSite(x, 0)));
27+
_logger.LogDebug("Got {Count} sites to observe", sites.Count);
2728

29+
var siteQueue = new Queue<QueuedSite>(sites.Select(x => new QueuedSite(x, 0)));
2830
while(siteQueue.TryDequeue(out var queuedSite))
2931
{
3032
using var _ = _logger.BeginScope(new Dictionary<string, object> { { "HiddenService", queuedSite.Site.SiteUri } });
33+
_logger.LogDebug("Starting observations on the next site");
3134
try
3235
{
3336
var observations = await ObserveSite(queuedSite.Site.SiteUri);
@@ -42,6 +45,7 @@ public async Task Execute(IJobExecutionContext context)
4245
continue;
4346
}
4447
}
48+
_logger.LogDebug("Site seems to be up");
4549
await _siteObserver.AddNewObservation(queuedSite.Site.SiteUri, observations.IsOk);
4650
_logger.LogInformation("Site observed");
4751
}
@@ -50,6 +54,7 @@ public async Task Execute(IJobExecutionContext context)
5054
_logger.LogError(e, "Observation for site failed");
5155
}
5256
}
57+
_logger.LogDebug("The queue is finally empty, observations finished");
5358
}
5459

5560
private record QueuedSite(Site Site, int ObservationsCount);

src/NTorSpectator.Observer/TorIntegration/TorControlManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public async Task<IReadOnlyCollection<HsDescEventReply>> HsFetch(string serviceD
8686
_logger.LogTrace("Received {Count} messages", responses.Length);
8787

8888
var replies = responses.Select(x => TorReply.TryParse(x, out var reply) ? reply : null).Where(x => x != null).ToList();
89-
_logger.LogInformation("Parsed {Count}", replies.Count);
89+
_logger.LogDebug("Parsed {Count}", replies.Count);
9090
var hsDescEvents = replies.OfType<HsDescEventReply>().Where(x => x.Action is HsDescAction.Received or HsDescAction.Failed).ToList();
9191
results.AddRange(hsDescEvents);
9292
if (results.Any(x => x.Action == HsDescAction.Received))

0 commit comments

Comments
 (0)