Skip to content

Commit 3097501

Browse files
committed
Merge branch 'vnext'
2 parents b7439f1 + 2a1dac6 commit 3097501

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

CompatBot/Config.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,8 @@ private static ILogger GetLog()
293293
loggingConfig.AddRule(LogLevel.Debug, LogLevel.Fatal, asyncFileTarget);
294294
loggingConfig.AddRule(LogLevel.Info, LogLevel.Fatal, watchdogTarget);
295295

296-
var ignoreFilter1 = new ConditionBasedFilter { Condition = "contains('${message}','TaskCanceledException')", Action = FilterResult.Ignore, };
297-
var ignoreFilter2 = new ConditionBasedFilter { Condition = "contains('${message}','One or more pre-execution checks failed')", Action = FilterResult.Ignore, };
296+
var ignoreFilter1 = new ConditionBasedFilter { Condition = "contains('${message}','TaskCanceledException')"!, Action = FilterResult.Ignore, };
297+
var ignoreFilter2 = new ConditionBasedFilter { Condition = "contains('${message}','One or more pre-execution checks failed')"!, Action = FilterResult.Ignore, };
298298
foreach (var rule in loggingConfig.LoggingRules)
299299
{
300300
rule.Filters.Add(ignoreFilter1);

CompatBot/Program.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using DSharpPlus.Commands.Processors.TextCommands.Parsing;
1616
using Microsoft.EntityFrameworkCore;
1717
using Microsoft.Extensions.Configuration.UserSecrets;
18+
using Microsoft.Extensions.DependencyInjection;
1819
using NLog;
1920
using NLog.Extensions.Logging;
2021

@@ -138,8 +139,12 @@ internal static async Task Main(string[] args)
138139
var mediaScreenshotMonitor = new MediaScreenshotMonitor();
139140
var clientBuilder = DiscordClientBuilder
140141
.CreateDefault(Config.Token, DiscordIntents.All)
141-
.ConfigureLogging(builder => builder.AddNLog(LogManager.Configuration))
142-
.UseZstdCompression()
142+
.ConfigureLogging(builder => builder.AddNLog(LogManager.Configuration!))
143+
.ConfigureServices(
144+
services => services.ConfigureHttpClientDefaults(
145+
builder => builder.RemoveAllLoggers()
146+
)
147+
).UseZstdCompression()
143148
.UseCommands((services, extension) =>
144149
{
145150
var textCommandProcessor = new TextCommandProcessor(new()

0 commit comments

Comments
 (0)