feat: upgrade to .NET 6, refactor everything
This commit is contained in:
@@ -1,94 +1,91 @@
|
||||
using System;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Diagnostics;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using App.Metrics;
|
||||
|
||||
using Myriad.Builders;
|
||||
using Myriad.Rest;
|
||||
using Myriad.Rest.Types.Requests;
|
||||
using Myriad.Types;
|
||||
|
||||
using NodaTime;
|
||||
|
||||
using Serilog;
|
||||
|
||||
namespace PluralKit.Bot
|
||||
namespace PluralKit.Bot;
|
||||
|
||||
public class ErrorMessageService
|
||||
{
|
||||
public class ErrorMessageService
|
||||
// globally rate limit errors for now, don't want to spam users when something breaks
|
||||
private static readonly Duration MinErrorInterval = Duration.FromSeconds(10);
|
||||
private static readonly Duration IntervalFromStartup = Duration.FromMinutes(5);
|
||||
private readonly ILogger _logger;
|
||||
|
||||
private readonly IMetrics _metrics;
|
||||
private readonly DiscordApiClient _rest;
|
||||
|
||||
public ErrorMessageService(IMetrics metrics, ILogger logger, DiscordApiClient rest)
|
||||
{
|
||||
// globally rate limit errors for now, don't want to spam users when something breaks
|
||||
private static readonly Duration MinErrorInterval = Duration.FromSeconds(10);
|
||||
private static readonly Duration IntervalFromStartup = Duration.FromMinutes(5);
|
||||
_metrics = metrics;
|
||||
_logger = logger;
|
||||
_rest = rest;
|
||||
|
||||
// private readonly ConcurrentDictionary<ulong, Instant> _lastErrorInChannel = new ConcurrentDictionary<ulong, Instant>();
|
||||
private Instant lastErrorTime { get; set; }
|
||||
lastErrorTime = SystemClock.Instance.GetCurrentInstant();
|
||||
}
|
||||
|
||||
private readonly IMetrics _metrics;
|
||||
private readonly ILogger _logger;
|
||||
private readonly DiscordApiClient _rest;
|
||||
// private readonly ConcurrentDictionary<ulong, Instant> _lastErrorInChannel = new ConcurrentDictionary<ulong, Instant>();
|
||||
private Instant lastErrorTime { get; set; }
|
||||
|
||||
public ErrorMessageService(IMetrics metrics, ILogger logger, DiscordApiClient rest)
|
||||
public async Task SendErrorMessage(ulong channelId, string errorId)
|
||||
{
|
||||
var now = SystemClock.Instance.GetCurrentInstant();
|
||||
if (!ShouldSendErrorMessage(channelId, now))
|
||||
{
|
||||
_metrics = metrics;
|
||||
_logger = logger;
|
||||
_rest = rest;
|
||||
|
||||
lastErrorTime = SystemClock.Instance.GetCurrentInstant();
|
||||
_logger.Warning("Rate limited sending error message to {ChannelId} with error code {ErrorId}",
|
||||
channelId, errorId);
|
||||
_metrics.Measure.Meter.Mark(BotMetrics.ErrorMessagesSent, "throttled");
|
||||
return;
|
||||
}
|
||||
|
||||
public async Task SendErrorMessage(ulong channelId, string errorId)
|
||||
var embed = new EmbedBuilder()
|
||||
.Color(0xE74C3C)
|
||||
.Title("Internal error occurred")
|
||||
.Description(
|
||||
"For support, please send the error code above in **#bug-reports-and-errors** on **[the support server *(click to join)*](https://discord.gg/PczBt78)** with a description of what you were doing at the time.")
|
||||
.Footer(new Embed.EmbedFooter(errorId))
|
||||
.Timestamp(now.ToDateTimeOffset().ToString("O"));
|
||||
|
||||
try
|
||||
{
|
||||
var now = SystemClock.Instance.GetCurrentInstant();
|
||||
if (!ShouldSendErrorMessage(channelId, now))
|
||||
{
|
||||
_logger.Warning("Rate limited sending error message to {ChannelId} with error code {ErrorId}", channelId, errorId);
|
||||
_metrics.Measure.Meter.Mark(BotMetrics.ErrorMessagesSent, "throttled");
|
||||
return;
|
||||
}
|
||||
await _rest.CreateMessage(channelId,
|
||||
new MessageRequest { Content = $"> **Error code:** `{errorId}`", Embed = embed.Build() });
|
||||
|
||||
var embed = new EmbedBuilder()
|
||||
.Color(0xE74C3C)
|
||||
.Title("Internal error occurred")
|
||||
.Description("For support, please send the error code above in **#bug-reports-and-errors** on **[the support server *(click to join)*](https://discord.gg/PczBt78)** with a description of what you were doing at the time.")
|
||||
.Footer(new(errorId))
|
||||
.Timestamp(now.ToDateTimeOffset().ToString("O"));
|
||||
|
||||
try
|
||||
{
|
||||
await _rest.CreateMessage(channelId, new()
|
||||
{
|
||||
Content = $"> **Error code:** `{errorId}`",
|
||||
Embed = embed.Build()
|
||||
});
|
||||
|
||||
_logger.Information("Sent error message to {ChannelId} with error code {ErrorId}", channelId, errorId);
|
||||
_metrics.Measure.Meter.Mark(BotMetrics.ErrorMessagesSent, "sent");
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
_logger.Error(e, "Error sending error message to {ChannelId}", channelId);
|
||||
_metrics.Measure.Meter.Mark(BotMetrics.ErrorMessagesSent, "failed");
|
||||
throw;
|
||||
}
|
||||
_logger.Information("Sent error message to {ChannelId} with error code {ErrorId}", channelId, errorId);
|
||||
_metrics.Measure.Meter.Mark(BotMetrics.ErrorMessagesSent, "sent");
|
||||
}
|
||||
|
||||
private bool ShouldSendErrorMessage(ulong channelId, Instant now)
|
||||
catch (Exception e)
|
||||
{
|
||||
// if (_lastErrorInChannel.TryGetValue(channelId, out var lastErrorTime))
|
||||
|
||||
var startupTime = Instant.FromDateTimeUtc(Process.GetCurrentProcess().StartTime.ToUniversalTime());
|
||||
// don't send errors during startup
|
||||
// mostly because Npgsql throws a bunch of errors when opening connections sometimes???
|
||||
if ((now - startupTime) < IntervalFromStartup)
|
||||
return false;
|
||||
|
||||
var interval = now - lastErrorTime;
|
||||
if (interval < MinErrorInterval)
|
||||
return false;
|
||||
|
||||
// _lastErrorInChannel[channelId] = now;
|
||||
lastErrorTime = now;
|
||||
return true;
|
||||
_logger.Error(e, "Error sending error message to {ChannelId}", channelId);
|
||||
_metrics.Measure.Meter.Mark(BotMetrics.ErrorMessagesSent, "failed");
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
private bool ShouldSendErrorMessage(ulong channelId, Instant now)
|
||||
{
|
||||
// if (_lastErrorInChannel.TryGetValue(channelId, out var lastErrorTime))
|
||||
|
||||
var startupTime = Instant.FromDateTimeUtc(Process.GetCurrentProcess().StartTime.ToUniversalTime());
|
||||
// don't send errors during startup
|
||||
// mostly because Npgsql throws a bunch of errors when opening connections sometimes???
|
||||
if (now - startupTime < IntervalFromStartup)
|
||||
return false;
|
||||
|
||||
var interval = now - lastErrorTime;
|
||||
if (interval < MinErrorInterval)
|
||||
return false;
|
||||
|
||||
// _lastErrorInChannel[channelId] = now;
|
||||
lastErrorTime = now;
|
||||
return true;
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user