Update logging

ModularAssistentForDiscordServer/Commands/Text/Base/ExitGuild.cs

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using System.Diagnostics;
 using DSharpPlus;
 using DSharpPlus.CommandsNext;
 using DSharpPlus.CommandsNext.Attributes;
@@ -42,18 +43,17 @@ public async Task Test(CommandContext ctx, DiscordChannel chnl, int limit)
     {
         var client = ModularDiscordBot.Services.GetRequiredService<DiscordRestClient>();
         var channel = await client.GetChannelAsync(chnl.Id);
-        var messages = channel.GetMessagesAfterAsync(ctx.Message.Id + 1221);
-
-        messages.ToBlockingEnumerable().Count();
+        var messages = channel.GetMessagesBeforeAsync(ctx.Message.Id + 1221, limit);
 
+        var sw = Stopwatch.StartNew();
 
         int i = 0;
         await foreach (var message in messages)
         {
             i++;
         }
 
-        await ctx.RespondAsync($"Found {i} messages");
+        await ctx.RespondAsync($"Found {i} messages in {sw.ElapsedMilliseconds}ms");
 
     }
 }

ModularAssistentForDiscordServer/ModularDiscordBot.cs

@@ -22,6 +22,7 @@
 using Quartz;
 using Serilog;
 
+
 namespace MADS;
 
 public class ModularDiscordBot

ModularAssistentForDiscordServer/Program.cs

@@ -23,6 +23,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Serilog;
+using Serilog.Events;
 
 namespace MADS;
 
@@ -32,6 +33,7 @@ public async static Task Main()
     {
         Log.Logger = new LoggerConfiguration()
             .WriteTo.Console()
+            .MinimumLevel.Override("Quartz", LogEventLevel.Warning)
             .CreateLogger();
 
         //Create cancellationToken and hook the cancelKey

ModularAssistentForDiscordServer/Services/DiscordClientService.cs

@@ -30,6 +30,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Serilog;
+using ILogger = Serilog.ILogger;
 
 namespace MADS.Services;
 
@@ -41,14 +42,16 @@ public class DiscordClientService : IHostedService
     public LoggingService Logging;
     public SlashCommandsExtension SlashCommands;
     public DateTime StartTime;
+
+    private static ILogger _logger = Log.ForContext<DiscordClientService>();
 
     public DiscordClientService
     (
         ConfigJson pConfig,
         IDbContextFactory<MadsContext> dbDbContextFactory
     )
     {
-        Log.Warning("DiscordClientService");
+        _logger.Warning("DiscordClientService");
 
         StartTime = DateTime.Now;
         var config = pConfig;
@@ -94,7 +97,7 @@ IDbContextFactory<MadsContext> dbDbContextFactory
 #if RELEASE
         SlashCommands.RegisterCommands(asm);
 #else
-        DiscordClient.Logger.LogWarning("DEBUG");
+        _logger.Warning("SlashCommands are registered in debug mode");
         SlashCommands.RegisterCommands(asm, 938120155974750288);
 #endif
         SlashCommands.SlashCommandErrored += EventListener.OnSlashCommandErrored;
@@ -124,15 +127,14 @@ IDbContextFactory<MadsContext> dbDbContextFactory
 
     public async Task StartAsync(CancellationToken cancellationToken)
     {
-        Log.Warning("DiscordClientService started");
-        //Update database to latest version
-        var context = await _dbContextFactory.CreateDbContextAsync();
+        _logger.Warning("DiscordClientService started");
+        //Update database to latest migration
+        using var context = await _dbContextFactory.CreateDbContextAsync();
         if ((await context.Database.GetPendingMigrationsAsync()).Any())
             await context.Database.MigrateAsync();
 
-        DiscordActivity act = new("over some Servers", ActivityType.Watching);
-
-
+        DiscordActivity act = new("Messing with code", ActivityType.Custom);
+
         //connect client
         await DiscordClient.ConnectAsync(act, UserStatus.Online);
     }

ModularAssistentForDiscordServer/Services/LoggingService.cs

@@ -23,6 +23,7 @@
 using MADS.Extensions;
 using Microsoft.Extensions.Logging;
 using Serilog;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace MADS.Services;
 
@@ -38,6 +39,8 @@ public class LoggingService
     private DiscordWebhookClient _discordWebhookClient = new();
     private bool _isSetup;
     private List<DiscordDmChannel> _ownerChannel = new();
+
+    private static Serilog.ILogger _logger = Log.ForContext<LoggingService>();
 
     internal LoggingService(DiscordClientService dBot)
     {
@@ -54,8 +57,6 @@ internal LoggingService(DiscordClientService dBot)
         File.AppendAllText(_logPath, $".Net: {RuntimeInformation.FrameworkDescription}\n", Encoding.UTF8);
         File.AppendAllText(_logPath, $"Operating system: {os}\n", Encoding.UTF8);
         File.AppendAllText(_logPath, "========== LOG START ==========\n\n", Encoding.UTF8);
-
-        Console.WriteLine(_logPath);
     }
 
     //Fetching Linux name by Naamloos. Can be found in Naamloos/Modcore
@@ -123,7 +124,7 @@ private async void AddOwnerChannels()
             _ownerChannel.Add(ownerChannel);
         }
 
-        _modularDiscordBot.DiscordClient.Logger.LogInformation(
+        _logger.Information(
             "Found {OwnerChannel} dm Channel for {Owner} application owner",
             _ownerChannel.Count, owners.Length);
     }

ModularAssistentForDiscordServer/Services/MessageSnipeService.cs

@@ -19,8 +19,8 @@
 using MADS.Extensions;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using Serilog;
+using ILogger = Serilog.ILogger;
 
 namespace MADS.Services;
 
@@ -31,6 +31,8 @@ public class MessageSnipeService : IHostedService
     private readonly DiscordClientService _discordClientService;
     private DiscordClient Discord  => _discordClientService.DiscordClient;
 
+    private static ILogger _logger = Log.ForContext<MessageSnipeService>();
+
     public MessageSnipeService(IMemoryCache memoryCache, DiscordClientService discordClientService)
     {
         _memoryCache = memoryCache;
@@ -43,7 +45,7 @@ public MessageSnipeService(IMemoryCache memoryCache, DiscordClientService discor
 
     public Task StartAsync(CancellationToken cancellationToken)
     {
-        Log.Warning("Sniper active!");
+        _logger.Warning("Sniper active!");
         Discord.MessageDeleted += MessageSniperDeleted;
         Discord.MessageUpdated += MessageSniperEdited;
 
@@ -70,8 +72,8 @@ MessageDeleteEventArgs e
         if ((!string.IsNullOrEmpty(e.Message?.Content) || e.Message?.Attachments.Count > 0) && !e.Message.Author.IsBot)
         {
             AddMessage(e.Message);
-            Log.Warning("Sniped!");
-            sender.Logger.LogTrace("Message added to cache");
+            _logger.Warning("Sniped!");
+            _logger.Verbose("Message added to cache");
         }
 
         return Task.CompletedTask;
@@ -90,15 +92,15 @@ MessageUpdateEventArgs e
             || e.Message.Author.IsBot) return Task.CompletedTask;
 
         AddEditedMessage(e.MessageBefore);
-        Log.Warning("Sniped!");
+        _logger.Warning("Sniped!");
 
-        sender.Logger.LogTrace("Message edit added to cache");
+        _logger.Verbose("Message edit added to cache");
         return Task.CompletedTask;
     }
 
     private static void PostEvictionCallback(object key, object value, EvictionReason reason, object state)
     {
-        Log.ForContext<MessageSnipeService>().Verbose("MessageSniper: Message eviction - {Reason}", reason.Humanize());
+        _logger.Verbose("MessageSniper: Message eviction - {Reason}", reason.Humanize());
     }
 
     public void AddMessage(DiscordMessage message)

ModularAssistentForDiscordServer/Services/OAuthTokenListenerService.cs

@@ -17,6 +17,8 @@
 using DSharpPlus;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Serilog;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace MADS.Services;
 
@@ -40,6 +42,8 @@ public class TokenListener : IDisposable, IHostedService
     private readonly DiscordClient _client;
     private Thread _listenTask;
 
+    private static Serilog.ILogger _logger = Log.ForContext<TokenListener>();
+
     public TokenListener(string port, DiscordClient client, string path = "/")
     {
         _url = $"http://localhost:{port}{path}";
@@ -56,7 +60,7 @@ public void Dispose()
     public Task StartAsync(CancellationToken cancellationToken)
     {
         _listener.Start();
-        _client.Logger.LogInformation("Listening for connections on {Url}", _url);
+        _logger.Information("Listening for connections on {Url}", _url);
 
         _listenTask = new Thread(() => _ = HandleIncomingConnections(cancellationToken))
         {
@@ -72,7 +76,7 @@ public Task StopAsync(CancellationToken cancellationToken)
     {
         _listener.Abort();
         _listenTask.Interrupt();
-        _client.Logger.LogInformation("Tokenlistener stopped");
+        _logger.Information("Tokenlistener stopped");
         return Task.CompletedTask;
     }
 

ModularAssistentForDiscordServer/Services/ReminderService.cs

@@ -22,6 +22,7 @@
 using Microsoft.Extensions.Logging;
 using Quartz;
 using Serilog;
+using ILogger = Serilog.ILogger;
 
 namespace MADS.Services;
 
@@ -34,6 +35,8 @@ public class ReminderService : IHostedService
     private bool _isDisposed;
     private bool _isRunning;
     private readonly DiscordRestClient _restClient;
+
+    private static ILogger _logger = Log.ForContext<ReminderService>();
 
     public ReminderService(IDbContextFactory<MadsContext> dbContextFactory, ISchedulerFactory schedulerFactory,
         DiscordClient client, DiscordRestClient rest)
@@ -55,7 +58,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
         if (ReminderScheduler == null) throw new NullReferenceException();
         await ReminderScheduler.Start();
         _isRunning = true;
-        _client.Logger.LogInformation("Reminders active");
+        _logger.Information("Reminders active");
     }
 
     public async Task StopAsync(CancellationToken cancellationToken)
@@ -65,7 +68,7 @@ public async Task StopAsync(CancellationToken cancellationToken)
         _isDisposed = true;
         _isRunning = false;
         await ReminderScheduler.Shutdown();
-        _client.Logger.LogInformation("Reminders stopped");
+        _logger.Information("Reminders stopped");
     }
 
     private async Task DispatchReminder(ReminderDbEntity reminder)
@@ -165,12 +168,12 @@ public async Task Execute(IJobExecutionContext context)
 
             if (reminder is null)
             {
-                Log.Warning("Tried to dispatch a nonexistent reminder: {Id} ",
+                _logger.Warning("Tried to dispatch a nonexistent reminder: {Id} ",
                     Convert.ToUInt64(dataMap.Get("reminderId")));
                 return;
             }
 
-            Log.Information("Dispatching reminder id: {Id}", reminder.Id);
+            _logger.Information("Dispatching reminder id: {Id}", reminder.Id);
 
             await _reminder.DispatchReminder(reminder);
         }