Skip to content

Commit 930395a

Browse files
nikita-petkonikita-petko
authored
Logging impl networking fixes (#324)
#!components: grid-bot,grid-bot-recovery #!deployable-components: grid-bot * Update to systems Projects: ~ Bump to all new package versions in respect to mfdlabs/grid-bot-libraries#29 ~ Bump Discord.Net to 3.15.2 OnLogMessage.cs: ~ Add system to consider connection based messages to be debug, instead of filling log files with junk AvatarUtility.cs: ~ Throw thumbnail exception if the response from the thumbnail download request returns null. * Update AvatarUtility.cs Move to coalasce * Fix for a container issue Please see the "Known Bugs" section of this release of Discord.Net: https://github.com/discord-net/Discord.Net/releases/tag/3.15.0
1 parent 363fc0b commit 930395a

File tree

9 files changed

+51
-35
lines changed

9 files changed

+51
-35
lines changed

‎services/grid-bot/lib/commands/Shared.Commands.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515

1616
<ItemGroup Label="CustomPackages" Condition=" '$(LocalBuild)' != 'true' ">
1717
<PackageReference Include="mfdlabs.ClientSettings.Client" Version="1.0.4" />
18-
<PackageReference Include="mfdlabs.FileSystem" Version="1.0.4" />
18+
<PackageReference Include="mfdlabs.FileSystem" Version="1.0.5" />
1919
<PackageReference Include="mfdlabs.FloodCheckers.Core" Version="1.0.4" />
20-
<PackageReference Include="mfdlabs.FloodCheckers.Redis" Version="1.0.4" />
20+
<PackageReference Include="mfdlabs.FloodCheckers.Redis" Version="1.0.5" />
2121
<PackageReference Include="mfdlabs.Text" Version="1.0.4" />
22-
<PackageReference Include="mfdlabs.Networking" Version="1.0.5" />
22+
<PackageReference Include="mfdlabs.Networking" Version="1.0.6" />
2323
</ItemGroup>
2424

2525
<ItemGroup Label="CustomPackages" Condition=" '$(LocalBuild)' == 'true' ">
@@ -32,9 +32,9 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="Discord.Net.WebSocket" Version="3.11.0" />
36-
<PackageReference Include="Discord.Net.Commands" Version="3.11.0" />
37-
<PackageReference Include="Discord.Net.Interactions" Version="3.11.0" />
35+
<PackageReference Include="Discord.Net.WebSocket" Version="3.15.2" />
36+
<PackageReference Include="Discord.Net.Commands" Version="3.15.2" />
37+
<PackageReference Include="Discord.Net.Interactions" Version="3.15.2" />
3838
<PackageReference Include="Loretta.CodeAnalysis.Lua" Version="0.2.11" />
3939
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.11.0" />
4040
<PackageReference Include="Microsoft.CodeAnalysis.Scripting.Common" Version="3.11.0" />

‎services/grid-bot/lib/events/Events/OnLogMessage.cs‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
namespace Grid.Bot.Events;
22

33
using System;
4+
using System.Linq;
45
using System.Net.WebSockets;
56
using System.Threading.Tasks;
7+
using System.Collections.Generic;
68

79
using Discord;
810
using Discord.Net;
@@ -20,7 +22,7 @@
2022
public class OnLogMessage
2123
{
2224
private readonly DiscordSettings _settings;
23-
25+
2426
#if DEBUG || DEBUG_LOGGING_IN_PROD
2527
private readonly IDiscordWebhookAlertManager _discordWebhookAlertManager;
2628
private readonly IBacktraceUtility _backtraceUtility;
@@ -34,6 +36,16 @@ public class OnLogMessage
3436
"log_severity"
3537
);
3638

39+
// These are specific strings that fill the log files up drastically.
40+
private static readonly HashSet<string> _messagesToBeConsideredDebug = new()
41+
{
42+
"Disconnecting",
43+
"Disconnected",
44+
"Connecting",
45+
"Connected",
46+
"Resumed previous session"
47+
};
48+
3749
#if DEBUG || DEBUG_LOGGING_IN_PROD
3850
/// <summary>
3951
/// Construct a new instance of <see cref="OnLogMessage"/>.
@@ -134,7 +146,10 @@ public Task Invoke(LogMessage message)
134146
_logger.Debug("{0}: {1}", message.Source, message.Message);
135147
break;
136148
case { Severity: LogSeverity.Info }:
137-
_logger.Information("{0}: {1}", message.Source, message.Message);
149+
if (_messagesToBeConsideredDebug.Any(m => m.Equals(message.Message, StringComparison.Ordinal)))
150+
_logger.Debug("{0}: {1}", message.Source, message.Message);
151+
else
152+
_logger.Information("{0}: {1}", message.Source, message.Message);
138153
break;
139154
case { Severity: LogSeverity.Verbose }:
140155
_logger.Debug("{0}: {1}", message.Source, message.Message);

‎services/grid-bot/lib/events/Shared.Events.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Discord.Net.WebSocket" Version="3.11.0" />
14-
<PackageReference Include="Discord.Net.Commands" Version="3.11.0" />
15-
<PackageReference Include="Discord.Net.Interactions" Version="3.11.0" />
13+
<PackageReference Include="Discord.Net.WebSocket" Version="3.15.2" />
14+
<PackageReference Include="Discord.Net.Commands" Version="3.15.2" />
15+
<PackageReference Include="Discord.Net.Interactions" Version="3.15.2" />
1616

1717
<PackageReference Include="prometheus-net" Version="8.0.1" />
1818
</ItemGroup>

‎services/grid-bot/lib/settings/Shared.Settings.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Discord.Net.Core" Version="3.11.0" />
15-
<PackageReference Include="Discord.Net.WebSocket" Version="3.11.0" />
14+
<PackageReference Include="Discord.Net.Core" Version="3.15.2" />
15+
<PackageReference Include="Discord.Net.WebSocket" Version="3.15.2" />
1616
</ItemGroup>
1717

1818
<ItemGroup Label="CustomPackages" Condition=" '$(LocalBuild)' != 'true' ">
19-
<PackageReference Include="mfdlabs.Configuration" Version="1.0.7" />
19+
<PackageReference Include="mfdlabs.Configuration" Version="1.0.8" />
2020
<PackageReference Include="mfdlabs.Redis" Version="1.0.4" />
21-
<PackageReference Include="mfdlabs.ServiceDiscovery" Version="1.0.4" />
22-
<PackageReference Include="mfdlabs.FloodCheckers.Redis" Version="1.0.4" />
21+
<PackageReference Include="mfdlabs.ServiceDiscovery" Version="1.0.5" />
22+
<PackageReference Include="mfdlabs.FloodCheckers.Redis" Version="1.0.5" />
2323

2424
<PackageReference Include="mfdlabs.Grid.ProcessManagement.Docker" Version="1.0.4" />
25-
<PackageReference Include="mfdlabs.Grid.ProcessManagement.Core" Version="1.0.4" />
26-
<PackageReference Include="mfdlabs.Grid.ProcessManagement" Version="1.0.4" />
25+
<PackageReference Include="mfdlabs.Grid.ProcessManagement.Core" Version="1.0.5" />
26+
<PackageReference Include="mfdlabs.Grid.ProcessManagement" Version="1.0.5" />
2727

2828
<PackageReference Include="mfdlabs.Thumbnails.Client" Version="1.0.4" />
2929
</ItemGroup>

‎services/grid-bot/lib/utility/Implementation/AvatarUtility.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,7 @@ private static string DownloadFile(string url)
189189
var file = File.OpenWrite(path);
190190

191191
using var client = new HttpClient();
192-
using var stream = client.GetStreamAsync(url).SyncOrDefault();
193-
192+
using var stream = client.GetStreamAsync(url).SyncOrDefault() ?? throw new ThumbnailResponseException(ThumbnailResponseState.Error, "The thumbnail response stream was null");
194193
stream.CopyTo(file);
195194

196195
file.Close();

‎services/grid-bot/lib/utility/Shared.Utility.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313
</ItemGroup>
1414

1515
<ItemGroup Label="CustomPackages" Condition=" '$(LocalBuild)' != 'true' ">
16-
<PackageReference Include="mfdlabs.FileSystem" Version="1.0.4" />
16+
<PackageReference Include="mfdlabs.FileSystem" Version="1.0.5" />
1717
<PackageReference Include="mfdlabs.FloodCheckers.Core" Version="1.0.4" />
18-
<PackageReference Include="mfdlabs.FloodCheckers.Redis" Version="1.0.4" />
18+
<PackageReference Include="mfdlabs.FloodCheckers.Redis" Version="1.0.5" />
1919
<PackageReference Include="mfdlabs.Grid.Commands" Version="1.0.4" />
2020
<PackageReference Include="mfdlabs.Grid.Client" Version="1.0.4" />
2121
<PackageReference Include="mfdlabs.Logging" Version="1.0.4" />
2222
<PackageReference Include="mfdlabs.Redis" Version="1.0.4" />
23-
<PackageReference Include="mfdlabs.ServiceDiscovery" Version="1.0.4" />
23+
<PackageReference Include="mfdlabs.ServiceDiscovery" Version="1.0.5" />
2424
<PackageReference Include="mfdlabs.Threading" Version="1.0.4" />
2525
<PackageReference Include="mfdlabs.Users.Client" Version="1.0.4" />
2626
<PackageReference Include="mfdlabs.Grid.ProcessManagement.Docker" Version="1.0.4" />
27-
<PackageReference Include="mfdlabs.Grid.ProcessManagement.Core" Version="1.0.4" />
28-
<PackageReference Include="mfdlabs.Networking" Version="1.0.5" />
27+
<PackageReference Include="mfdlabs.Grid.ProcessManagement.Core" Version="1.0.5" />
28+
<PackageReference Include="mfdlabs.Networking" Version="1.0.6" />
2929
<PackageReference Include="mfdlabs.Thumbnails.Client" Version="1.0.4" />
3030
</ItemGroup>
3131

@@ -50,7 +50,7 @@
5050
<PackageReference Include="Backtrace" Version="2.1.9" />
5151
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
5252
<PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" />
53-
<PackageReference Include="Discord.Net.WebSocket" Version="3.11.0" />
53+
<PackageReference Include="Discord.Net.WebSocket" Version="3.15.2" />
5454
</ItemGroup>
5555

5656
<!-- Protobuf -->

‎services/grid-bot/src/Grid.Bot.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<ItemGroup Label="CustomPackages" Condition=" '$(LocalBuild)' != 'true' ">
2626
<PackageReference Include="mfdlabs.Random" Version="1.0.4" />
2727
<PackageReference Include="mfdlabs.Redis" Version="1.0.4" />
28-
<PackageReference Include="mfdlabs.Configuration.Core" Version="1.0.4" />
28+
<PackageReference Include="mfdlabs.Configuration.Core" Version="1.0.5" />
2929
</ItemGroup>
3030

3131
<ItemGroup Label="CustomPackages" Condition=" '$(LocalBuild)' == 'true' ">
@@ -37,9 +37,9 @@
3737
<ItemGroup>
3838
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
3939

40-
<PackageReference Include="Discord.Net.WebSocket" Version="3.11.0" />
41-
<PackageReference Include="Discord.Net.Commands" Version="3.11.0" />
42-
<PackageReference Include="Discord.Net.Interactions" Version="3.11.0" />
40+
<PackageReference Include="Discord.Net.WebSocket" Version="3.15.2" />
41+
<PackageReference Include="Discord.Net.Commands" Version="3.15.2" />
42+
<PackageReference Include="Discord.Net.Interactions" Version="3.15.2" />
4343
<PackageReference Include="prometheus-net.AspNetCore" Version="8.0.1" />
4444
<PackageReference Include="Grpc.AspNetCore" Version="2.62.0" />
4545
</ItemGroup>

‎services/grid-bot/src/Runner.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242

4343
using LogLevel = Logging.LogLevel;
4444
using MELLogLevel = Microsoft.Extensions.Logging.LogLevel;
45+
using Discord.Rest;
4546

4647
internal static class Runner
4748
{
@@ -180,6 +181,7 @@ private static ServiceProvider InitializeServices()
180181

181182
services.AddSingleton(config)
182183
.AddSingleton(interactionServiceConfig)
184+
.AddSingleton<IRestClientProvider>(x => x.GetRequiredService<DiscordShardedClient>())
183185
.AddSingleton<DiscordShardedClient>()
184186
.AddSingleton<InteractionService>();
185187

‎services/recovery/src/Grid.Bot.Recovery.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup Label="CustomPackages" Condition=" '$(LocalBuild)' != 'true' ">
18-
<PackageReference Include="mfdlabs.Configuration" Version="1.0.7" />
18+
<PackageReference Include="mfdlabs.Configuration" Version="1.0.8" />
1919
<PackageReference Include="mfdlabs.Logging" Version="1.0.4" />
20-
<PackageReference Include="mfdlabs.Networking" Version="1.0.5" />
20+
<PackageReference Include="mfdlabs.Networking" Version="1.0.6" />
2121
</ItemGroup>
2222

2323
<ItemGroup Label="CustomPackages" Condition=" '$(LocalBuild)' == 'true' ">
@@ -29,9 +29,9 @@
2929
<ItemGroup>
3030
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
3131

32-
<PackageReference Include="Discord.Net.WebSocket" Version="3.11.0" />
33-
<PackageReference Include="Discord.Net.Commands" Version="3.11.0" />
34-
<PackageReference Include="Discord.Net.Interactions" Version="3.11.0" />
32+
<PackageReference Include="Discord.Net.WebSocket" Version="3.15.2" />
33+
<PackageReference Include="Discord.Net.Commands" Version="3.15.2" />
34+
<PackageReference Include="Discord.Net.Interactions" Version="3.15.2" />
3535
<PackageReference Include="prometheus-net.AspNetCore" Version="8.0.1" />
3636
</ItemGroup>
3737

0 commit comments

Comments
 (0)