fixing hangfire logs

MiruFx · Feb 29, 2024 · b013f3e · b013f3e
1 parent b6cff24
commit b013f3e
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 11 deletions.
diff --git a/src/Miru.Redis/RedisRegistry.cs b/src/Miru.Redis/RedisRegistry.cs
@@ -1,6 +1,4 @@
 using System;
-using Hangfire;
-using Hangfire.Redis;
 using Hangfire.Redis.StackExchange;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;

diff --git a/src/Miru.Testing/StorageTestServiceCollectionExtensions.cs b/src/Miru.Testing/StorageTestServiceCollectionExtensions.cs
@@ -22,11 +22,29 @@ public static IServiceCollection AddAppTestStorage(this IServiceCollection servi
         return services.AddAppStorage<AppTestStorage>();
     }
 
+    public static FormFile FormFile2(
+        this ITestFixture fixture, 
+        string fileName, 
+        string fileContent,
+        string contentType = null)
+    {
+        var path = fixture.AppStorage().Temp() / fileName;
+
+        if (contentType is null)
+            contentType = MimeTypes.MimeTypeMap.GetMimeType(path.FileExtension());
+
+        path.Dir().EnsureDirExist();
+
+        File.WriteAllText(path, fileContent);
+
+        return fixture.FormFile(path, contentType);
+    }
+
     public static FormFile FormFile(this ITestFixture fixture, MiruPath path, string contentType)
     {
         var stream = File.OpenRead(path);
 
-        var file = new FormFile(stream, 0, stream.Length, null, System.IO.Path.GetFileName(path))
+        var file = new FormFile(stream, 0, stream.Length, null, Path.GetFileName(path))
         {
             Headers = new HeaderDictionary(),
             ContentType = contentType

diff --git a/src/Miru/MiruServiceCollectionExtensions.cs b/src/Miru/MiruServiceCollectionExtensions.cs
@@ -33,6 +33,7 @@ public static class MiruServiceCollectionExtensions
         services.AddSerilogConfig(config =>
         {
             config.MinimumLevel.Override(typeof(TStartup).Assembly.GetName().Name, LogEventLevel.Information);
+            config.MinimumLevel.Override("Hangfire", LogEventLevel.Error);
         });
 
         services.AddFlashMessage();

diff --git a/src/Miru/QueueingRegistry.cs b/src/Miru/QueueingRegistry.cs
@@ -26,13 +26,15 @@ public static class QueueingRegistry
                 // .UseConsole registers routes into hangfire dashboard statically
                 // So in automated tests, when queue is registered in different ServiceProvider
                 // instances, UseConsole unfairly throws InvalidOperationException
-                try
-                {
-                    configuration.UseColouredConsoleLogProvider();
-                }
-                catch (InvalidOperationException)
-                {
-                }
+                // try
+                // {
+                //     configuration
+                //         .UseSerilogLogProvider()
+                //         .UseColouredConsoleLogProvider();
+                // }
+                // catch (InvalidOperationException)
+                // {
+                // }
                 
                 queuingBuilder?.Invoke(builder);
             });

diff --git a/tests/Miru.Tests/Queuing/QueueingTest.cs b/tests/Miru.Tests/Queuing/QueueingTest.cs
@@ -25,7 +25,7 @@ public override IServiceCollection ConfigureServices(IServiceCollection services
             .AddSingleton<BackgroundJobServer>()
             .AddSerilogConfig(x =>
             {
-                x.MinimumLevel.Information();
+                x.MinimumLevel.Fatal();
                 x.WriteToTestConsole();
             });
     }