Merge branch 'vnext'

This commit is contained in:
13xforever
2025-07-07 23:40:49 +05:00
2 changed files with 9 additions and 4 deletions

View File

@@ -293,8 +293,8 @@ internal static class Config
loggingConfig.AddRule(LogLevel.Debug, LogLevel.Fatal, asyncFileTarget);
loggingConfig.AddRule(LogLevel.Info, LogLevel.Fatal, watchdogTarget);
var ignoreFilter1 = new ConditionBasedFilter { Condition = "contains('${message}','TaskCanceledException')", Action = FilterResult.Ignore, };
var ignoreFilter2 = new ConditionBasedFilter { Condition = "contains('${message}','One or more pre-execution checks failed')", Action = FilterResult.Ignore, };
var ignoreFilter1 = new ConditionBasedFilter { Condition = "contains('${message}','TaskCanceledException')"!, Action = FilterResult.Ignore, };
var ignoreFilter2 = new ConditionBasedFilter { Condition = "contains('${message}','One or more pre-execution checks failed')"!, Action = FilterResult.Ignore, };
foreach (var rule in loggingConfig.LoggingRules)
{
rule.Filters.Add(ignoreFilter1);

View File

@@ -15,6 +15,7 @@ using DSharpPlus.Commands.Processors.TextCommands;
using DSharpPlus.Commands.Processors.TextCommands.Parsing;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration.UserSecrets;
using Microsoft.Extensions.DependencyInjection;
using NLog;
using NLog.Extensions.Logging;
@@ -138,8 +139,12 @@ internal static class Program
var mediaScreenshotMonitor = new MediaScreenshotMonitor();
var clientBuilder = DiscordClientBuilder
.CreateDefault(Config.Token, DiscordIntents.All)
.ConfigureLogging(builder => builder.AddNLog(LogManager.Configuration))
.UseZstdCompression()
.ConfigureLogging(builder => builder.AddNLog(LogManager.Configuration!))
.ConfigureServices(
services => services.ConfigureHttpClientDefaults(
builder => builder.RemoveAllLoggers()
)
).UseZstdCompression()
.UseCommands((services, extension) =>
{
var textCommandProcessor = new TextCommandProcessor(new()