chore(deps): update

UETCTF-VNU · Jul 22, 2024 · 1beff09 · 1beff09
1 parent 4f29171
commit 1beff09
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -49,7 +49,7 @@
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
     <PackageVersion Include="Serilog.Sinks.Grafana.Loki" Version="8.3.0" />
-    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.4" />
+    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.5" />
     <PackageVersion Include="BouncyCastle.Cryptography" Version="2.4.0" />
     <PackageVersion Include="PacketDotNet" Version="1.4.7" />
     <PackageVersion Include="SharpPcap" Version="6.3.0" />

diff --git a/src/GZCTF/ClientApp/package.json b/src/GZCTF/ClientApp/package.json
@@ -78,7 +78,7 @@
     "lodash": "^4.17.21",
     "oxlint": "^0.6.1",
     "postcss": "^8.4.39",
-    "postcss-preset-mantine": "^1.16.0",
+    "postcss-preset-mantine": "^1.17.0",
     "postcss-simple-vars": "^7.0.1",
     "prettier": "~3.3.3",
     "rollup": "^4.19.0",

diff --git a/src/GZCTF/ClientApp/pnpm-lock.yaml b/src/GZCTF/ClientApp/pnpm-lock.yaml
diff --git a/src/GZCTF/Extensions/DatabaseSinkExtension.cs b/src/GZCTF/Extensions/DatabaseSinkExtension.cs
@@ -79,22 +79,22 @@ async Task WriteToDatabase(CancellationToken token = default)
                 while (_logBuffer.TryDequeue(out LogModel? logModel))
                     lockedLogBuffer.Add(logModel);
 
-                if (lockedLogBuffer.Count > 50 || DateTimeOffset.Now - _lastFlushTime > TimeSpan.FromSeconds(10))
+                if (lockedLogBuffer.Count <= 50 && DateTimeOffset.Now - _lastFlushTime <= TimeSpan.FromSeconds(10)) 
+                    continue;
+
+                await using AsyncServiceScope scope = _serviceProvider.CreateAsyncScope();
+
+                var dbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+                await dbContext.Logs.AddRangeAsync(lockedLogBuffer, token);
+
+                try
+                {
+                    await dbContext.SaveChangesAsync(token);
+                }
+                finally
                 {
-                    await using AsyncServiceScope scope = _serviceProvider.CreateAsyncScope();
-
-                    var dbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
-                    await dbContext.Logs.AddRangeAsync(lockedLogBuffer, token);
-
-                    try
-                    {
-                        await dbContext.SaveChangesAsync(token);
-                    }
-                    finally
-                    {
-                        lockedLogBuffer.Clear();
-                        _lastFlushTime = DateTimeOffset.Now;
-                    }
+                    lockedLogBuffer.Clear();
+                    _lastFlushTime = DateTimeOffset.Now;
                 }
             }
         }

diff --git a/src/GZCTF/Utils/AsyncManualResetEvent.cs b/src/GZCTF/Utils/AsyncManualResetEvent.cs
@@ -23,7 +23,7 @@ public async Task WaitAsync(CancellationToken cancellationToken = default)
         await await Task.WhenAny(tcs.Task, cancelTcs.Task);
     }
 
-    async Task<bool> Delay(int milliseconds)
+    static async Task<bool> Delay(int milliseconds)
     {
         await Task.Delay(milliseconds);
         return false;