rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Добавлена обработка исключений при настройке прокси для Discord webhooks: предусмотрено продолжение работы без прокси при ошибках.

Browse source
This commit is contained in:
Vigers Ray 2026-01-17 23:26:28 +01:00
parent b1b7f3eeab
commit 7aac95145c
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Content.Server/Discord/DiscordWebhook.cs
View file

@ -151,10 +151,19 @@ public sealed class DiscordWebhook : IPostInjectInit, IDisposable
_sawmill.Debug("No proxy configured for Discord webhooks.");
}
else
{
try
{
client = CreateClientWithProxies(proxyAddress);
_sawmill.Info("Configured Discord webhooks to use proxies");
}
catch (Exception ex)
{
_sawmill.Error($"Failed to configure proxy for Discord webhooks: {ex.Message}. Continuing without proxy.");
client = new HttpClient();
client.Timeout = Timeout;
}
}
// Add custom headers if configured
TryAddCustomHeaders(client);
@ -165,18 +174,23 @@ public sealed class DiscordWebhook : IPostInjectInit, IDisposable
private HttpClient CreateClientWithProxies(string proxyAddress)
{
var handler = CreateHandler(proxyAddress);
if (handler == null)
{
throw new InvalidOperationException("Failed to create proxy handler");
}
var client = new HttpClient(handler);
client.Timeout = Timeout;
return client;
}
public SocketsHttpHandler CreateHandler(string proxyAddress)
public SocketsHttpHandler? CreateHandler(string proxyAddress)
{
if (!Uri.TryCreate(proxyAddress, UriKind.Absolute, out var proxyUri))
{
_sawmill.Error($"Invalid proxy URI: {proxyAddress}. Discord connections will fail.");
throw new UriFormatException($"Invalid proxy address: {proxyAddress}");
_sawmill.Error($"Invalid proxy URI: {proxyAddress}. Discord connections will continue without proxy.");
return null;
}
var proxyUsername = _configuration.GetCVar(SunriseCCVars.DiscordProxyUsername);