From 1059a4da1659d9fee6f8501b0fbebbd7f4797a4a Mon Sep 17 00:00:00 2001 From: js6pak Date: Sat, 6 Mar 2021 18:13:16 +0100 Subject: [PATCH] Add debug logs in AnnouncementsService --- src/Impostor.Server/Net/AnnouncementsService.cs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/Impostor.Server/Net/AnnouncementsService.cs b/src/Impostor.Server/Net/AnnouncementsService.cs index d205045..a58abf2 100644 --- a/src/Impostor.Server/Net/AnnouncementsService.cs +++ b/src/Impostor.Server/Net/AnnouncementsService.cs @@ -12,6 +12,7 @@ using Impostor.Hazel.Udp; using Impostor.Server.Config; using Impostor.Server.Events.Announcements; using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.ObjectPool; using Microsoft.Extensions.Options; @@ -19,13 +20,15 @@ namespace Impostor.Server.Net { internal class AnnouncementsService : IHostedService { + private readonly ILogger _logger; private readonly AnnouncementsServerConfig _config; private readonly ObjectPool _readerPool; private readonly IEventManager _eventManager; private UdpConnectionListener _connection; - public AnnouncementsService(IOptions config, ObjectPool readerPool, IEventManager eventManager) + public AnnouncementsService(ILogger logger, IOptions config, ObjectPool readerPool, IEventManager eventManager) { + _logger = logger; _config = config.Value; _readerPool = readerPool; _eventManager = eventManager; @@ -48,10 +51,13 @@ namespace Impostor.Server.Net }; await _connection.StartAsync(); + + _logger.LogInformation("Announcements server is listening on {Address}:{Port}", endpoint.Address, endpoint.Port); } public async Task StopAsync(CancellationToken cancellationToken) { + _logger.LogWarning("Announcements server is shutting down!"); await _connection.DisposeAsync(); } @@ -59,6 +65,8 @@ namespace Impostor.Server.Net { MessageHello.Deserialize(e.HandshakeData, out var announcementVersion, out var id, out var language); + _logger.LogDebug("Client requested announcement (version: {Version}, id: {Id}, language: {Language})", announcementVersion, id, language); + if (announcementVersion != 2) { await e.Connection.Disconnect("Unsupported announcement version"); @@ -75,6 +83,8 @@ namespace Impostor.Server.Net using var writer = MessageWriter.Get(MessageType.Reliable); Message00UseCache.Serialize(writer); await e.Connection.SendAsync(writer); + + _logger.LogDebug("Sent UseCache response"); } if (response.Announcement != null) @@ -83,6 +93,8 @@ namespace Impostor.Server.Net var announcement = response.Announcement.Value; Message01Update.Serialize(writer, announcement.Id, announcement.Message); await e.Connection.SendAsync(writer); + + _logger.LogDebug("Sent ({Id}) {Message}", announcement.Id, announcement.Message); } if (response.FreeWeekendState != FreeWeekendState.NotFree) @@ -90,6 +102,8 @@ namespace Impostor.Server.Net using var writer = MessageWriter.Get(MessageType.Reliable); Message02SetFreeWeekend.Serialize(writer, response.FreeWeekendState); await e.Connection.SendAsync(writer); + + _logger.LogDebug("Sent {FreeWeekendState} weekend state", response.FreeWeekendState); } await e.Connection.Disconnect(null); -- 2.39.5