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.
mfdlabs · Jul 3, 2024 · ae60bbd · ae60bbd
1 parent 363fc0b
commit ae60bbd
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 33 deletions.
diff --git a/services/grid-bot/lib/commands/Shared.Commands.csproj b/services/grid-bot/lib/commands/Shared.Commands.csproj
@@ -15,11 +15,11 @@
 
   <ItemGroup Label="CustomPackages" Condition=" '$(LocalBuild)' != 'true' ">
     <PackageReference Include="mfdlabs.ClientSettings.Client" Version="1.0.4" />
-    <PackageReference Include="mfdlabs.FileSystem" Version="1.0.4" />
+    <PackageReference Include="mfdlabs.FileSystem" Version="1.0.5" />
     <PackageReference Include="mfdlabs.FloodCheckers.Core" Version="1.0.4" />
-    <PackageReference Include="mfdlabs.FloodCheckers.Redis" Version="1.0.4" />
+    <PackageReference Include="mfdlabs.FloodCheckers.Redis" Version="1.0.5" />
     <PackageReference Include="mfdlabs.Text" Version="1.0.4" />
-    <PackageReference Include="mfdlabs.Networking" Version="1.0.5" />
+    <PackageReference Include="mfdlabs.Networking" Version="1.0.6" />
   </ItemGroup>
 
   <ItemGroup Label="CustomPackages" Condition=" '$(LocalBuild)' == 'true' ">
@@ -32,9 +32,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Discord.Net.WebSocket" Version="3.11.0" />
-    <PackageReference Include="Discord.Net.Commands" Version="3.11.0" />
-    <PackageReference Include="Discord.Net.Interactions" Version="3.11.0" />
+    <PackageReference Include="Discord.Net.WebSocket" Version="3.15.2" />
+    <PackageReference Include="Discord.Net.Commands" Version="3.15.2" />
+    <PackageReference Include="Discord.Net.Interactions" Version="3.15.2" />
     <PackageReference Include="Loretta.CodeAnalysis.Lua" Version="0.2.11" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.11.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.Scripting.Common" Version="3.11.0" />

diff --git a/services/grid-bot/lib/events/Events/OnLogMessage.cs b/services/grid-bot/lib/events/Events/OnLogMessage.cs
@@ -1,8 +1,10 @@
 namespace Grid.Bot.Events;
 
 using System;
+using System.Linq;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
+using System.Collections.Generic;
 
 using Discord;
 using Discord.Net;
@@ -20,7 +22,7 @@
 public class OnLogMessage
 {
     private readonly DiscordSettings _settings;
-    
+
 #if DEBUG || DEBUG_LOGGING_IN_PROD
     private readonly IDiscordWebhookAlertManager _discordWebhookAlertManager;
     private readonly IBacktraceUtility _backtraceUtility;
@@ -34,6 +36,16 @@ public class OnLogMessage
         "log_severity"
     );
 
+    // These are specific strings that fill the log files up drastically.
+    private static readonly HashSet<string> _messagesToBeConsideredDebug = new()
+    {
+        "Disconnecting",
+        "Disconnected",
+        "Connecting",
+        "Connected",
+        "Resumed previous session"
+    };
+
 #if DEBUG || DEBUG_LOGGING_IN_PROD
     /// <summary>
     /// Construct a new instance of <see cref="OnLogMessage"/>.
@@ -134,7 +146,10 @@ public Task Invoke(LogMessage message)
                 _logger.Debug("{0}: {1}", message.Source, message.Message);
                 break;
             case { Severity: LogSeverity.Info }:
-                _logger.Information("{0}: {1}", message.Source, message.Message);
+                if (_messagesToBeConsideredDebug.Any(m => m.Equals(message.Message, StringComparison.Ordinal)))
+                    _logger.Debug("{0}: {1}", message.Source, message.Message);
+                else
+                    _logger.Information("{0}: {1}", message.Source, message.Message);
                 break;
             case { Severity: LogSeverity.Verbose }:
                 _logger.Debug("{0}: {1}", message.Source, message.Message);

diff --git a/services/grid-bot/lib/events/Shared.Events.csproj b/services/grid-bot/lib/events/Shared.Events.csproj
@@ -10,9 +10,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Discord.Net.WebSocket" Version="3.11.0" />
-    <PackageReference Include="Discord.Net.Commands" Version="3.11.0" />
-    <PackageReference Include="Discord.Net.Interactions" Version="3.11.0" />
+    <PackageReference Include="Discord.Net.WebSocket" Version="3.15.2" />
+    <PackageReference Include="Discord.Net.Commands" Version="3.15.2" />
+    <PackageReference Include="Discord.Net.Interactions" Version="3.15.2" />
 
     <PackageReference Include="prometheus-net" Version="8.0.1" />
   </ItemGroup>

diff --git a/services/grid-bot/lib/settings/Shared.Settings.csproj b/services/grid-bot/lib/settings/Shared.Settings.csproj
@@ -11,19 +11,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Discord.Net.Core" Version="3.11.0" />
-    <PackageReference Include="Discord.Net.WebSocket" Version="3.11.0" />
+    <PackageReference Include="Discord.Net.Core" Version="3.15.2" />
+    <PackageReference Include="Discord.Net.WebSocket" Version="3.15.2" />
   </ItemGroup>
 
   <ItemGroup Label="CustomPackages" Condition=" '$(LocalBuild)' != 'true' ">
-    <PackageReference Include="mfdlabs.Configuration" Version="1.0.7" /> 
+    <PackageReference Include="mfdlabs.Configuration" Version="1.0.8" /> 
     <PackageReference Include="mfdlabs.Redis" Version="1.0.4" />
-    <PackageReference Include="mfdlabs.ServiceDiscovery" Version="1.0.4" />
-    <PackageReference Include="mfdlabs.FloodCheckers.Redis" Version="1.0.4" />
+    <PackageReference Include="mfdlabs.ServiceDiscovery" Version="1.0.5" />
+    <PackageReference Include="mfdlabs.FloodCheckers.Redis" Version="1.0.5" />
 
     <PackageReference Include="mfdlabs.Grid.ProcessManagement.Docker" Version="1.0.4" />
-    <PackageReference Include="mfdlabs.Grid.ProcessManagement.Core" Version="1.0.4" />
-    <PackageReference Include="mfdlabs.Grid.ProcessManagement" Version="1.0.4" />
+    <PackageReference Include="mfdlabs.Grid.ProcessManagement.Core" Version="1.0.5" />
+    <PackageReference Include="mfdlabs.Grid.ProcessManagement" Version="1.0.5" />
 
     <PackageReference Include="mfdlabs.Thumbnails.Client" Version="1.0.4" />
   </ItemGroup>

diff --git a/services/grid-bot/lib/utility/Implementation/AvatarUtility.cs b/services/grid-bot/lib/utility/Implementation/AvatarUtility.cs
@@ -191,6 +191,8 @@ private static string DownloadFile(string url)
         using var client = new HttpClient();
         using var stream = client.GetStreamAsync(url).SyncOrDefault();
 
+        if (stream == null) throw new ThumbnailResponseException(ThumbnailResponseState.Error, "The thumbnail response stream was null");
+
         stream.CopyTo(file);
 
         file.Close();

diff --git a/services/grid-bot/lib/utility/Shared.Utility.csproj b/services/grid-bot/lib/utility/Shared.Utility.csproj
@@ -13,19 +13,19 @@
   </ItemGroup>
 
   <ItemGroup Label="CustomPackages" Condition=" '$(LocalBuild)' != 'true' ">
-    <PackageReference Include="mfdlabs.FileSystem" Version="1.0.4" />
+    <PackageReference Include="mfdlabs.FileSystem" Version="1.0.5" />
     <PackageReference Include="mfdlabs.FloodCheckers.Core" Version="1.0.4" />
-    <PackageReference Include="mfdlabs.FloodCheckers.Redis" Version="1.0.4" />
+    <PackageReference Include="mfdlabs.FloodCheckers.Redis" Version="1.0.5" />
     <PackageReference Include="mfdlabs.Grid.Commands" Version="1.0.4" />
     <PackageReference Include="mfdlabs.Grid.Client" Version="1.0.4" />
     <PackageReference Include="mfdlabs.Logging" Version="1.0.4" />
     <PackageReference Include="mfdlabs.Redis" Version="1.0.4" />
-    <PackageReference Include="mfdlabs.ServiceDiscovery" Version="1.0.4" />
+    <PackageReference Include="mfdlabs.ServiceDiscovery" Version="1.0.5" />
     <PackageReference Include="mfdlabs.Threading" Version="1.0.4" />
     <PackageReference Include="mfdlabs.Users.Client" Version="1.0.4" />
     <PackageReference Include="mfdlabs.Grid.ProcessManagement.Docker" Version="1.0.4" />
-    <PackageReference Include="mfdlabs.Grid.ProcessManagement.Core" Version="1.0.4" />
-    <PackageReference Include="mfdlabs.Networking" Version="1.0.5" />
+    <PackageReference Include="mfdlabs.Grid.ProcessManagement.Core" Version="1.0.5" />
+    <PackageReference Include="mfdlabs.Networking" Version="1.0.6" />
     <PackageReference Include="mfdlabs.Thumbnails.Client" Version="1.0.4" />
   </ItemGroup>
 
@@ -50,7 +50,7 @@
     <PackageReference Include="Backtrace" Version="2.1.9" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
     <PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" />
-    <PackageReference Include="Discord.Net.WebSocket" Version="3.11.0" />
+    <PackageReference Include="Discord.Net.WebSocket" Version="3.15.2" />
   </ItemGroup>
 
   <!-- Protobuf -->

diff --git a/services/grid-bot/src/Grid.Bot.csproj b/services/grid-bot/src/Grid.Bot.csproj
@@ -25,7 +25,7 @@
   <ItemGroup Label="CustomPackages" Condition=" '$(LocalBuild)' != 'true' ">
     <PackageReference Include="mfdlabs.Random" Version="1.0.4" />
     <PackageReference Include="mfdlabs.Redis" Version="1.0.4" />
-    <PackageReference Include="mfdlabs.Configuration.Core" Version="1.0.4" />
+    <PackageReference Include="mfdlabs.Configuration.Core" Version="1.0.5" />
   </ItemGroup>
 
   <ItemGroup Label="CustomPackages" Condition=" '$(LocalBuild)' == 'true' ">
@@ -37,9 +37,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
 
-    <PackageReference Include="Discord.Net.WebSocket" Version="3.11.0" />
-    <PackageReference Include="Discord.Net.Commands" Version="3.11.0" />
-    <PackageReference Include="Discord.Net.Interactions" Version="3.11.0" />
+    <PackageReference Include="Discord.Net.WebSocket" Version="3.15.2" />
+    <PackageReference Include="Discord.Net.Commands" Version="3.15.2" />
+    <PackageReference Include="Discord.Net.Interactions" Version="3.15.2" />
     <PackageReference Include="prometheus-net.AspNetCore" Version="8.0.1" />
     <PackageReference Include="Grpc.AspNetCore" Version="2.62.0" />
   </ItemGroup>

diff --git a/services/recovery/src/Grid.Bot.Recovery.csproj b/services/recovery/src/Grid.Bot.Recovery.csproj
@@ -15,9 +15,9 @@
   </PropertyGroup> 
 
   <ItemGroup Label="CustomPackages" Condition=" '$(LocalBuild)' != 'true' ">
-    <PackageReference Include="mfdlabs.Configuration" Version="1.0.7" />
+    <PackageReference Include="mfdlabs.Configuration" Version="1.0.8" />
     <PackageReference Include="mfdlabs.Logging" Version="1.0.4" />
-    <PackageReference Include="mfdlabs.Networking" Version="1.0.5" />
+    <PackageReference Include="mfdlabs.Networking" Version="1.0.6" />
   </ItemGroup>
 
   <ItemGroup Label="CustomPackages" Condition=" '$(LocalBuild)' == 'true' ">
@@ -29,9 +29,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
 
-    <PackageReference Include="Discord.Net.WebSocket" Version="3.11.0" />
-    <PackageReference Include="Discord.Net.Commands" Version="3.11.0" />
-    <PackageReference Include="Discord.Net.Interactions" Version="3.11.0" />
+    <PackageReference Include="Discord.Net.WebSocket" Version="3.15.2" />
+    <PackageReference Include="Discord.Net.Commands" Version="3.15.2" />
+    <PackageReference Include="Discord.Net.Interactions" Version="3.15.2" />
     <PackageReference Include="prometheus-net.AspNetCore" Version="8.0.1" />
   </ItemGroup>