Merge pull request #231 from WeihanLi/dev

WeihanLi · web-flow · commit 617fbe8977f2 · 2024-12-09T23:36:59.000+08:00
1.0.73 preview 1
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -17,7 +17,7 @@
     <PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />
     <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="Serilog" Version="4.0.2" />
+    <PackageVersion Include="Serilog" Version="4.1.0" />
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
@@ -31,11 +31,11 @@
     <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.11" />
-    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.11" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.0" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
-    <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
+    <PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
     <PackageVersion Include="Dapper" Version="2.1.44" />
   </ItemGroup>
   <ItemGroup>
diff --git a/README.md b/README.md
@@ -28,7 +28,3 @@
 ## Release Notes
 
 See pull requests list for changes <https://github.com/WeihanLi/WeihanLi.Common/pulls?q=is%3Apr+is%3Amerged+base%3Amaster>
-
-## Contact
-
-Contact me if you need: <weihanli@outlook.com>
diff --git a/build/version.props b/build/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <VersionMajor>1</VersionMajor>
     <VersionMinor>0</VersionMinor>
-    <VersionPatch>72</VersionPatch>
+    <VersionPatch>73</VersionPatch>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
   </PropertyGroup>
 </Project>
diff --git a/samples/DotNetCoreSample/LoggerTest.cs b/samples/DotNetCoreSample/LoggerTest.cs
@@ -35,7 +35,10 @@ public static void MainTest()
     public static void MicrosoftLoggingTest()
     {
         var services = new ServiceCollection()
-            .AddLogging(builder => builder.AddConsole())
+            .AddLogging(builder => 
+                // builder.AddConsole()
+                builder.AddFile()
+                )
             .AddSingleton(typeof(GenericTest<>))
             .BuildServiceProvider();
         services.GetRequiredService<GenericTest<int>>()
@@ -46,7 +49,7 @@ public static void MicrosoftLoggingTest()
         Console.WriteLine();
 
         services = new ServiceCollection()
-            .AddLogging(builder => builder.AddConsole().UseCustomGenericLogger(options => options.FullNamePredict = _ => true))
+            .AddLogging(builder => builder.AddConsole().UseCustomGenericLogger())
             .AddSingleton(typeof(GenericTest<>))
             .BuildServiceProvider();
         services.GetRequiredService<GenericTest<int>>()
diff --git a/samples/DotNetCoreSample/Program.cs b/samples/DotNetCoreSample/Program.cs
@@ -347,7 +347,7 @@
 
 // InvokeHelper.TryInvoke(() => throw null, 3);
 
-await InvokeHelper.TryInvokeAsync(TemplatingSample.MainTest);
+InvokeHelper.TryInvoke(LoggerTest.MicrosoftLoggingTest);
 
 ConsoleHelper.ReadKeyWithPrompt("Press any key to exit");
 
diff --git a/src/WeihanLi.Common/Extensions/JsonSerializeExtension.cs b/src/WeihanLi.Common/Extensions/JsonSerializeExtension.cs
@@ -10,7 +10,9 @@ public static class JsonSerializeExtension
     /// <summary>
     /// DefaultSerializerSettings
     /// </summary>
-    private static readonly JsonSerializerSettings DefaultSerializerSettings = GetDefaultSerializerSettings();
+    internal static readonly JsonSerializerSettings DefaultSerializerSettings = GetDefaultSerializerSettings();
+    internal static readonly JsonSerializerSettings WriteIndentedSerializerSettings =
+        SerializerSettingsWith(s => s.Formatting = Formatting.Indented);
 
     private static JsonSerializerSettings GetDefaultSerializerSettings() => new()
     {
@@ -46,13 +48,19 @@ public static string ToJson(this object? obj)
     public static string ToJson(this object obj, JsonSerializerSettings? serializerSettings)
         => obj.ToJson(false, serializerSettings);
 
+    /// <summary>
+    /// Serialize to Indented Json
+    /// </summary>
+    /// <param name="obj">object</param>
+    /// <returns>To Indented Json</returns>
+    public static string ToIndentedJson(this object obj) => obj.ToJson(false, WriteIndentedSerializerSettings);
+
     /// <summary>
     /// 将object对象转换为Json数据
     /// </summary>
     /// <param name="obj">目标对象</param>
     /// <param name="isConvertToSingleQuotes">是否将双引号转成单引号</param>
-    public static string ToJson(this object? obj, bool isConvertToSingleQuotes)
-        => obj.ToJson(isConvertToSingleQuotes, null);
+    public static string ToJson(this object? obj, bool isConvertToSingleQuotes) => obj.ToJson(isConvertToSingleQuotes, null);
 
     /// <summary>
     /// 将object对象转换为Json数据
@@ -62,7 +70,7 @@ public static string ToJson(this object? obj, bool isConvertToSingleQuotes)
     /// <param name="settings">serializerSettings</param>
     public static string ToJson(this object? obj, bool isConvertToSingleQuotes, JsonSerializerSettings? settings)
     {
-        if (obj == null)
+        if (obj is null)
         {
             return string.Empty;
         }
diff --git a/src/WeihanLi.Common/Helpers/DisposableHelper.cs b/src/WeihanLi.Common/Helpers/DisposableHelper.cs
@@ -14,7 +14,7 @@ public void Dispose()
     }
 
     public ValueTask DisposeAsync() =>
-#if NET6_0_OR_GREATER
+#if NET
         ValueTask.CompletedTask
 #else
         default
@@ -33,16 +33,18 @@ public ValueTask DisposeAsync() =>
 /// <param name="disposeAction">dispose delegate</param>
 public sealed class DisposableAction(Action? disposeAction) : IDisposable, IAsyncDisposable
 {
+    private Action? _disposeAction = disposeAction;
+
     public void Dispose()
     {
-        Interlocked.Exchange(ref disposeAction, null)?.Invoke();
+        Interlocked.Exchange(ref _disposeAction, null)?.Invoke();
     }
 
     public ValueTask DisposeAsync()
     {
         Dispose();
         return
-#if NET6_0_OR_GREATER
+#if NET
             ValueTask.CompletedTask
 #else
             default
@@ -100,7 +102,7 @@ protected virtual ValueTask DisposeAsyncCore()
     {
         // dispose managed state in async way (managed objects)
         return
-#if NET6_0_OR_GREATER
+#if NET
             ValueTask.CompletedTask
 #else
             default
diff --git a/src/WeihanLi.Common/Helpers/JsonHelper.cs b/src/WeihanLi.Common/Helpers/JsonHelper.cs
@@ -1,6 +1,6 @@
 ﻿// Copyright (c) Weihan Li. All rights reserved.
 // Licensed under the Apache license.
-#if NET6_0_OR_GREATER
+#if NET
 
 using System.Text.Encodings.Web;
 using System.Text.Json;
diff --git a/src/WeihanLi.Common/Logging/FileLoggingProcessor.cs b/src/WeihanLi.Common/Logging/FileLoggingProcessor.cs
@@ -0,0 +1,121 @@
+﻿// Copyright (c) Weihan Li. All rights reserved.
+// Licensed under the Apache license.
+
+using Microsoft.Extensions.Logging;
+using System.Collections.Concurrent;
+using System.Text;
+using WeihanLi.Common.Helpers;
+using WeihanLi.Extensions;
+
+namespace WeihanLi.Common.Logging;
+
+internal sealed class FileLoggingProcessor : DisposableBase
+{
+    private readonly FileLoggingOptions _options;
+    private readonly BlockingCollection<(string log, DateTimeOffset timestamp)> _messageQueue = [];
+    private readonly Thread _outputThread;
+    
+    private FileStream? _fileStream;
+    private string? _logFileName;
+
+    public FileLoggingProcessor(FileLoggingOptions options)
+    {
+        if (!Directory.Exists(options.LogsDirectory))
+        {
+            try
+            {
+                Directory.CreateDirectory(options.LogsDirectory);
+            }
+            catch (Exception e)
+            {
+                throw new InvalidOperationException("Failed to create log directory", e);
+            }   
+        }
+        
+        _options = options;
+        _outputThread = new Thread(ProcessLogQueue)
+        {
+            IsBackground = true,
+            Priority = ThreadPriority.BelowNormal,
+            Name = "FileLoggingProcessor"
+        };
+        _outputThread.Start();
+    }
+
+    public void EnqueueLog(string log, DateTimeOffset dateTimeOffset)
+    {
+        if (_messageQueue.IsAddingCompleted) return;
+        
+        try
+        {
+            _messageQueue.Add((log, dateTimeOffset));
+        }
+        catch (InvalidOperationException) { }
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        if (!disposing) return;
+        
+        _messageQueue.CompleteAdding();
+        _fileStream?.Flush();
+        _fileStream?.Dispose();
+        _messageQueue.Dispose();
+    }
+    
+    private void ProcessLogQueue()
+    {
+        try
+        {
+            foreach (var message in _messageQueue.GetConsumingEnumerable())
+            {
+                WriteLoggingEvent(message.log, message.timestamp);
+            }
+        }
+        catch
+        {
+            try
+            {
+                _messageQueue.CompleteAdding();
+            }
+            catch
+            {
+                // ignored
+            }
+        }
+    }
+
+    private void WriteLoggingEvent(string log, DateTimeOffset timestamp)
+    {
+        var fileName = _options.FileFormat.Replace("{date}", timestamp.ToString("yyyyMMdd"));
+        var fileInfo = new FileInfo(Path.Combine(_options.LogsDirectory, fileName));
+
+        try
+        {
+            var previousFileName = Interlocked.CompareExchange(ref _logFileName, fileInfo.FullName, _logFileName);
+            if (_logFileName != previousFileName)
+            {
+                // file name changed
+                var fs = File.OpenWrite(fileInfo.FullName);
+                var originalWriter = Interlocked.Exchange(ref _fileStream, fs);
+                if (originalWriter is not null)
+                {
+                    originalWriter.Flush();
+                    originalWriter.Dispose();
+                }
+            }
+
+            Guard.NotNull(_fileStream);
+            var bytes = Encoding.UTF8.GetBytes(log);
+            _fileStream.Write(bytes, 0, bytes.Length);
+            if (SecurityHelper.Random.CoinToss())
+            {
+                _fileStream.Flush();
+            }
+        }
+        catch(Exception ex)
+        {
+            Console.WriteLine($@"Error when trying to log to file({fileInfo.FullName}) \n" + log + Environment.NewLine + ex);
+        }
+    }
+}
diff --git a/src/WeihanLi.Common/Logging/LoggerGeneric.cs b/src/WeihanLi.Common/Logging/LoggerGeneric.cs
@@ -6,7 +6,7 @@ namespace WeihanLi.Common.Logging;
 
 public sealed class GenericLoggerOptions
 {
-    public Func<Type, bool>? FullNamePredict { get; set; }
+    public Func<Type, bool>? FullNamePredict { get; set; } = _ => true;
 }
 
 internal sealed class GenericLogger<T> : ILogger<T>
diff --git a/src/WeihanLi.Common/Logging/MicrosoftLoggingLoggerExtensions.cs b/src/WeihanLi.Common/Logging/MicrosoftLoggingLoggerExtensions.cs
diff --git a/src/WeihanLi.Common/Services/ITenantProvider.cs b/src/WeihanLi.Common/Services/ITenantProvider.cs

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace WeihanLi.Common.Logging;`
`6`	`6`
`7`	`7`	`public sealed class GenericLoggerOptions`
`8`	`8`	`{`
`9`		`- public Func<Type, bool>? FullNamePredict { get; set; }`
	`9`	`+ public Func<Type, bool>? FullNamePredict { get; set; } = _ => true;`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`internal sealed class GenericLogger<T> : ILogger<T>`