Adam
/
AyCode.Core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Adam:5b2044a160da4c8ecb1744ae1c668a90d47f5486
Branches Tags
Adam:master
Adam:FruitBank_v0.0.8.0
Adam:FruitBank_v0.0.5.1
Adam:TIAM_v0.0.5.1
Adam:TIAM_v0.0.6.0
Adam:Freyler_v4.70.1
Adam:MissNation_v0.0.5.1
Adam:Fullepi_Sandbox
..
compare: Adam:8da8b65892c27b5faaba099a2c3e1e0333019cc7
Branches Tags
Adam:FruitBank_v0.0.8.0
Adam:FruitBank_v0.0.5.1
Adam:TIAM_v0.0.5.1
Adam:master
Adam:TIAM_v0.0.6.0
Adam:Freyler_v4.70.1
Adam:MissNation_v0.0.5.1
Adam:Fullepi_Sandbox

No commits in common. "5b2044a160da4c8ecb1744ae1c668a90d47f5486" and "8da8b65892c27b5faaba099a2c3e1e0333019cc7" have entirely different histories.
5b2044a160 ... 8da8b65892

26 changed files with 84 additions and 182 deletions
Show Stats Expand all files Collapse all files

6
AyCode.Core.sln
View File

@ -35,9 +35,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AyCode.Services.Server", "A
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AyCode.Services.Server.Tests", "AyCode.Services.Server.Tests\AyCode.Services.Server.Tests.csproj", "{9AC9AF60-280A-4871-A7FA-69AB4D0C858A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AyCode.Core.Tests.Internal", "AyCode.Core.Tests.Internal\AyCode.Core.Tests.Internal.csproj", "{DE2DD6A4-A906-4BA6-8AAA-2A0433DF523F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AyCode.Core.Tests.Internal", "AyCode.Core.Tests.Internal\AyCode.Core.Tests.Internal.csproj", "{DE2DD6A4-A906-4BA6-8AAA-2A0433DF523F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AyCode.Database.Tests.Internal", "AyCode.Database.Tests.Internal\AyCode.Database.Tests.Internal.csproj", "{73261A8C-FB41-4C4C-90D4-ED5EEC991413}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AyCode.Database.Tests.Internal", "AyCode.Database.Tests.Internal\AyCode.Database.Tests.Internal.csproj", "{73261A8C-FB41-4C4C-90D4-ED5EEC991413}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -109,9 +109,11 @@ Global
{DE2DD6A4-A906-4BA6-8AAA-2A0433DF523F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DE2DD6A4-A906-4BA6-8AAA-2A0433DF523F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DE2DD6A4-A906-4BA6-8AAA-2A0433DF523F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DE2DD6A4-A906-4BA6-8AAA-2A0433DF523F}.Release|Any CPU.Build.0 = Release|Any CPU
{73261A8C-FB41-4C4C-90D4-ED5EEC991413}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{73261A8C-FB41-4C4C-90D4-ED5EEC991413}.Debug|Any CPU.Build.0 = Debug|Any CPU
{73261A8C-FB41-4C4C-90D4-ED5EEC991413}.Release|Any CPU.ActiveCfg = Release|Any CPU
{73261A8C-FB41-4C4C-90D4-ED5EEC991413}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

28
AyCode.Core/Loggers/AcConsoleLogWriter.cs
View File

@ -10,51 +10,39 @@ public interface IAcConsoleLogWriter : IAcTextLogWriterBase
public class AcConsoleLogWriter : AcTextLogWriterBase, IAcConsoleLogWriter
{
protected AcConsoleLogWriter() : this(null)
{
Initialize();
}
{ }
protected AcConsoleLogWriter(string? categoryName = null) : base(categoryName)
{
Initialize();
}
{ }
public AcConsoleLogWriter(AppType appType, LogLevel logLevel, string? categoryName = null) : base(appType, logLevel, categoryName)
{
Initialize();
}
{ }
private static void Initialize()
{
Console.ForegroundColor = ConsoleColor.White;
}
protected override void WriteText(string? logText, LogLevel loglevel)
protected override void WriteText(string? logText)
{
if (logText.IsNullOrWhiteSpace()) return;
//lock (ForWriterLock)
{
if (loglevel is > LogLevel.Trace and < LogLevel.Suggest)
//if (logLevel > LogLevel.Trace && logLevel < LogLevel.Suggest)
{
//Console.ForegroundColor = ConsoleColor.White;
Console.WriteLine(logText);
return;
}
if (loglevel <= LogLevel.Trace)
if (LogLevel <= LogLevel.Trace)
{
Console.ForegroundColor = ConsoleColor.Gray;
Console.WriteLine(logText);
}
else if (loglevel == LogLevel.Suggest)
else if (LogLevel == LogLevel.Suggest)
{
Console.ForegroundColor = ConsoleColor.Cyan;
Console.WriteLine(logText);
}
else
{
Console.ForegroundColor = loglevel == LogLevel.Warning ? ConsoleColor.Yellow : ConsoleColor.Red;
Console.ForegroundColor = LogLevel == LogLevel.Warning ? ConsoleColor.Yellow : ConsoleColor.Red;
Console.WriteLine($"{AcEnv.NL}{logText}{AcEnv.NL}");
}

4
AyCode.Core/Loggers/AcLogWriterBase.cs
View File

@ -84,8 +84,4 @@ public abstract class AcLogWriterBase : IAcLogWriterBase
throw new NotImplementedException();
}
public virtual void Write(IAcLogItemClient logItem)
{
throw new NotImplementedException();
}
}

6
AyCode.Core/Loggers/AcLoggerBase.cs
View File

@ -1,5 +1,4 @@
using System.Runtime.CompilerServices;
using System.Security.AccessControl;
using AyCode.Core.Consts;
using AyCode.Core.Enums;
using static System.Net.Mime.MediaTypeNames;
@ -110,9 +109,4 @@ public abstract class AcLoggerBase : IAcLoggerBase
{
if (LogLevel <= logLevel) LogWriters.ForEach(x => x.Write(appType, logLevel, logText, callerMemberName, categoryName ?? CategoryName, errorType, exMessage));
}
public void Write(IAcLogItemClient logItem)
{
if (LogLevel <= logItem.LogLevel) LogWriters.ForEach(x => x.Write(logItem));
}
}

32
AyCode.Core/Loggers/AcTextLogWriterBase.cs
View File

@ -1,5 +1,4 @@
using AyCode.Core.Consts;
using AyCode.Core.Enums;
using AyCode.Core.Enums;
using AyCode.Utils.Extensions;
namespace AyCode.Core.Loggers;
@ -22,41 +21,30 @@ public abstract class AcTextLogWriterBase : AcLogWriterBase, IAcTextLogWriterBas
{
if (logLevel < LogLevel) return;
WriteText(GetDiagnosticText(appType, logLevel, logText, callerMemberName, categoryName, null, null), logLevel);
WriteText(GetDiagnosticText(appType, logLevel, logText, callerMemberName, categoryName, null, null));
}
public override void Write(IAcLogItemClient logItem)
{
if (logItem.LogLevel < LogLevel) return;
WriteText(GetDiagnosticText(logItem), logItem.LogLevel);
}
protected virtual void WriteText(string? logText, LogLevel loglevel)
protected virtual void WriteText(string? logText)
{
throw new NotImplementedException();
}
protected string GetDiagnosticText(IAcLogItemClient logItem)
=> GetDiagnosticText(logItem.TimeStampUtc, logItem.AppType, logItem.LogLevel, logItem.ThreadId, logItem.Text, logItem.CallerName, logItem.CategoryName, logItem.ErrorType, logItem.Exception);
protected string GetDiagnosticText(LogLevel logLevel, string? logText, string? callerMemberName, string? categoryName = null, Exception? ex = null)
protected virtual string GetDiagnosticText(LogLevel logLevel, string? logText, string? callerMemberName, string? categoryName = null, Exception? ex = null)
=> GetDiagnosticText(AppType, logLevel, logText, callerMemberName, categoryName, ex?.GetType().Name, ex?.ToString());
protected string GetDiagnosticText(AppType appType, LogLevel logLevel, string? logText, string? callerMemberName, string? categoryName, string? errorType, string? exMessage)
=> GetDiagnosticText(DateTime.UtcNow, appType, logLevel, Environment.CurrentManagedThreadId, logText, callerMemberName, categoryName, errorType, exMessage);
protected string GetDiagnosticText(DateTime utcNow, AppType appType, LogLevel logLevel, int threadId, string? logText, string? callerMemberName, string? categoryName, string? errorType, string? exMessage)
protected virtual string GetDiagnosticText(AppType appType, LogLevel logLevel, string? logText, string? callerMemberName, string? categoryName, string? errorType, string? exMessage)
{
if (LogLevel > logLevel) return string.Empty;
var threadId = Environment.CurrentManagedThreadId;
if(categoryName.IsNullOrWhiteSpace()) categoryName = CategoryName;
return $"[{utcNow.ToLocalTime():HH:mm:ss.fff}] [{appType.ToString()[0]}] {"[" + logLevel + "]",-9} {"[" + categoryName + "->" + callerMemberName + "]",-54} {"[" + threadId + "]",5} {logText}{ErrorText(errorType, exMessage)}";
return $"[{DateTime.Now:HH:mm:ss.fff}] [{appType.ToString()[0]}] {"[" + logLevel + "]",-9} {"[" + categoryName + "->" + callerMemberName + "]",-54} {"[" + threadId + "]",5} {logText}{ErrorText(errorType, exMessage)}";
}
protected string ErrorText(Exception? ex)
protected virtual string ErrorText(Exception? ex)
{
return ex == null ? string.Empty : ErrorText(ex.GetType().Name, ex.ToString());
}
@ -65,6 +53,6 @@ public abstract class AcTextLogWriterBase : AcLogWriterBase, IAcTextLogWriterBas
{
if (errorType.IsNullOrWhiteSpace() && exMessage.IsNullOrWhiteSpace()) return string.Empty;
return string.IsNullOrWhiteSpace(errorType) ? string.Empty : $"{AcEnv.NL}[{errorType.ToUpper()}]: {exMessage}";
return string.IsNullOrWhiteSpace(errorType) ? string.Empty : $"{Environment.NewLine}[{errorType.ToUpper()}]: {exMessage}";
}
}

1
AyCode.Core/Loggers/IAcLogWriterBase.cs
View File

@ -29,5 +29,4 @@ public interface IAcLogWriterBase
public void Write(AppType appType, LogLevel logLevel, string? logText, string? callerMemberName, string? categoryName, Exception? ex);
public void Write(AppType appType, LogLevel logLevel, string? logText, string? callerMemberName, string? categoryName, string? errorType, string? exMessage);
public void Write(IAcLogItemClient logItem);
}

2
AyCode.Database.Tests/AyCode.Database.Tests.csproj
View File

@ -10,7 +10,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />

4
AyCode.Database/AcDbLogItemWriter.cs
View File

@ -4,9 +4,9 @@ using AyCode.Core.Helpers;
using AyCode.Core.Loggers;
using AyCode.Database.DbContexts.Loggers;
using AyCode.Entities;
using AyCode.Entities.LogItems;
using AyCode.Entities.Server.LogItems;
using AyCode.Interfaces.Entities;
using Microsoft.EntityFrameworkCore;
namespace AyCode.Database;
@ -26,8 +26,6 @@ public class AcDbLogItemWriter<TLoggerDbContext, TLogItem> : AcLogItemWriterBase
protected override void WriteLogItemCallback(TLogItem logItem)
{
//using var ctx = Activator.CreateInstance<TLoggerDbContext>();
_ctx.LogItems.Add(logItem);
_ctx.SaveChanges();
}

8
AyCode.Database/AyCode.Database.csproj
View File

@ -7,10 +7,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
</ItemGroup>

4
AyCode.Database/DataLayers/AcDalBase.cs
View File

@ -21,12 +21,8 @@ public abstract class AcDalBase<TDbContext> : IAcDalBase<TDbContext> where TDbCo
public bool AutoCloseSession { get; set; }
/// <summary>
/// Do not use it! Use Session or Transaction... - J.
/// </summary>
public TDbContext Context { get; private set; }
public Mutex MutextLock { get; } = new();
//protected AcDalBase()
//{
// Name = $"{GetType().Name}";

5
AyCode.Database/DataLayers/IAcDalBase.cs
View File

@ -10,12 +10,7 @@ public interface IAcDalBase //: IDisposable
public interface IAcDalBase<TDbContext> : IAcDalBase where TDbContext : AcDbContextBase
{
public bool AutoCloseSession { get; set; }
/// <summary>
/// Do not use it! Use Session or Transaction... - J.
/// </summary>
public TDbContext Context { get; }
public Mutex MutextLock { get; }
public TDbContext CreateDbContext();
public void CloseDbContext(ref TDbContext? ctx);

9
AyCode.Database/DbContexts/Loggers/AcLoggerDbContextBase.cs
View File

@ -1,19 +1,12 @@
using AyCode.Database.DbSets.Loggers;
using AyCode.Entities.LogItems;
using AyCode.Entities.Server.LogItems;
using AyCode.Interfaces.Entities;
using Microsoft.EntityFrameworkCore;
using Microsoft.Identity.Client;
namespace AyCode.Database.DbContexts.Loggers;
public class AcLoggerDbContextBase<TLogItem> : AcDbContextBase, IAcLoggerDbContextBase<TLogItem> where TLogItem : class, IAcLogItem
{
public DbSet<TLogItem> LogItems { get; set; }
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
base.OnConfiguring(optionsBuilder);
optionsBuilder.UseQueryTrackingBehavior(QueryTrackingBehavior.NoTracking);
}
}

1
AyCode.Database/DbContexts/Loggers/IAcLoggerDbContextBase.cs
View File

@ -1,4 +1,5 @@
using AyCode.Database.DbSets.Loggers;
using AyCode.Entities.LogItems;
using AyCode.Entities.Server.LogItems;
using AyCode.Interfaces.Entities;

3
AyCode.Database/DbSets/Loggers/IAcLogItemDbSetBase.cs
View File

@ -1,4 +1,5 @@
using AyCode.Entities.Server.LogItems;
using AyCode.Entities.LogItems;
using AyCode.Entities.Server.LogItems;
using AyCode.Interfaces.Entities;
using AyCode.Interfaces.Users;
using Microsoft.EntityFrameworkCore;

28
AyCode.Database/Extensions/AcDalExtension.cs
View File

@ -2,7 +2,6 @@
using AyCode.Database.DataLayers;
using AyCode.Database.DbContexts;
using AyCode.Interfaces.Entities;
using AyCode.Utils.Extensions;
namespace AyCode.Database.Extensions;
@ -16,22 +15,16 @@ public static class AcDalExtension
public static TResultType Session<TDbContext, TResultType>(this IAcDalBase<TDbContext> acDal, Func<TDbContext, TResultType> callback) where TDbContext : AcDbContextBase
{
//using var ctx = acDal.CreateDbContext();
using (acDal.MutextLock.UseWaitOne())
{
return acDal.Context.Session(callback);
}
using var ctx = acDal.CreateDbContext();
return ctx.Session(callback);
}
public static IEnumerable<TEntity> Session<TDbContext, TEntity>(this IAcDalBase<TDbContext> acDal, Func<TDbContext, IQueryable<TEntity>> callback) where TEntity : IEntity where TDbContext : AcDbContextBase
{
//using var ctx = acDal.CreateDbContext();
using (acDal.MutextLock.UseWaitOne())
{
return acDal.Context.Session(callback);
}
using var ctx = acDal.CreateDbContext();
return ctx.Session(callback);
}
public static Task<bool> TransactionAsync<TDbContext>(this IAcDalBase<TDbContext> acDal, Func<TDbContext, bool> callbackTransactionBody, bool throwException = false) where TDbContext : AcDbContextBase
@ -39,11 +32,8 @@ public static class AcDalExtension
public static bool Transaction<TDbContext>(this IAcDalBase<TDbContext> acDal, Func<TDbContext, bool> callbackTransactionBody, bool throwException = false) where TDbContext : AcDbContextBase
{
//using var ctx = acDal.CreateDbContext();
using (acDal.MutextLock.UseWaitOne())
{
return acDal.Context.Transaction(callbackTransactionBody, throwException);
}
using var ctx = acDal.CreateDbContext();
return ctx.Transaction(callbackTransactionBody, throwException);
}
}

8
AyCode.Entities.Server/LogItems/AcLogItem.cs
View File

@ -2,6 +2,7 @@
using System.ComponentModel.DataAnnotations.Schema;
using AyCode.Core.Enums;
using AyCode.Core.Loggers;
using AyCode.Entities.LogItems;
namespace AyCode.Entities.Server.LogItems;
@ -12,7 +13,10 @@ public class AcLogItem : AcLogItemClient, IAcLogItem
public int Id { get; set; }
public int LogHeaderId { get; set; }
public DateTime TimeStampUtc { get; set; }
public AcLogItem() : base()
{ }
public AcLogItem()
{
TimeStampUtc = DateTime.UtcNow;
}
}

2
AyCode.Entities.Server/LogItems/IAcLogItem.cs
View File

@ -1,5 +1,6 @@
using AyCode.Core.Enums;
using AyCode.Core.Loggers;
using AyCode.Entities.LogItems;
using AyCode.Interfaces.Entities;
namespace AyCode.Entities.Server.LogItems;
@ -7,4 +8,5 @@ namespace AyCode.Entities.Server.LogItems;
public interface IAcLogItem : IAcLogItemClient, IEntityInt
{
public int LogHeaderId { get; set; }
public DateTime TimeStampUtc { get; set; }
}

22
AyCode.Entities/AcLogItemWriterBase.cs
View File

@ -1,6 +1,7 @@
using AyCode.Core.Enums;
using AyCode.Core.Helpers;
using AyCode.Core.Loggers;
using AyCode.Entities.LogItems;
using AyCode.Interfaces.Entities;
using AyCode.Utils.Extensions;
using System.Collections.Concurrent;
@ -22,11 +23,10 @@ public abstract class AcLogItemWriterBase<TLogItem> : AcLogWriterBase where TLog
{
}
protected virtual TLogItem CreateLogItem(DateTime utcNow, AppType appType, int threadId, LogLevel logLevel, string? logText, string? callerMemberName, string? categoryName = null, string? errorType = null, string? exMessage = null)
protected virtual TLogItem CreateLogItem(AppType appType, int threadId, LogLevel logLevel, string? logText, string? callerMemberName, string? categoryName = null, string? errorType = null, string? exMessage = null)
{
var logItem = Activator.CreateInstance<TLogItem>();
logItem.TimeStampUtc = utcNow;
logItem.AppType = appType;
logItem.LogLevel = logLevel;
logItem.CategoryName = categoryName ?? CategoryName;
@ -40,25 +40,21 @@ public abstract class AcLogItemWriterBase<TLogItem> : AcLogWriterBase where TLog
return logItem;
}
public override void Write(IAcLogItemClient logItem)
=> WriteLogItemAsync(logItem as TLogItem);
public override void Write(AppType appType, LogLevel logLevel, string? logText, string? callerMemberName, string? categoryName, string? errorType, string? exMessage)
=> WriteAsync(appType, logLevel, logText, callerMemberName, categoryName, errorType, exMessage);
protected virtual void WriteAsync(AppType appType, LogLevel logLevel, string? logText, string? callerMemberName, string? categoryName, string? errorType, string? exMessage)
protected virtual void WriteAsync(AppType appType, LogLevel logLevel, string? logText, string? callerMemberName, string? categoryName, string? errorType, string? exMessage)
{
if (logLevel < LogLevel) return;
var utcNow = DateTime.UtcNow;
var threadId = Environment.CurrentManagedThreadId;
TaskHelper.RunOnThreadPool(() => WriteLogItem(CreateLogItem(utcNow, appType, threadId, logLevel, logText, callerMemberName, categoryName, errorType, exMessage)));
TaskHelper.RunOnThreadPool(() => WriteLogItem(CreateLogItem(appType, threadId, logLevel, logText, callerMemberName, categoryName, errorType, exMessage)));
}
public void WriteLogItemAsync(TLogItem? logItem)
public void WriteLogItemAsync(TLogItem logItem)
{
if (logItem == null || logItem.LogLevel < LogLevel) return;
if (logItem.LogLevel < LogLevel) return;
TaskHelper.RunOnThreadPool(() => WriteLogItem(logItem));
}
@ -76,9 +72,7 @@ public abstract class AcLogItemWriterBase<TLogItem> : AcLogWriterBase where TLog
}
catch (Exception ex)
{
Console.WriteLine($@"ERROR!!! {nameof(AcLogItemWriterBase<TLogItem>)}->WriteLogItem; ex: {ex.Message}{AcEnv.NL}{AcEnv.NL}{ex}");
//Console.WriteLine("ERRORORROROR! " + AcEnv.NL + ex);
//throw;
Console.WriteLine("ERRORORROROR! " + AcEnv.NL + ex);
}
}

27
AyCode.Entities/LogItems/AcLogItemClient.cs
View File

@ -1,32 +1,19 @@
using AyCode.Core.Enums;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using AyCode.Core.Enums;
using AyCode.Core.Interfaces;
using AyCode.Core.Loggers;
namespace AyCode.Core.Loggers;
namespace AyCode.Entities.LogItems;
public class AcLogItemClient : IAcLogItemClient
{
public DateTime TimeStampUtc { get; set; }
public AppType AppType { get; set; }
public LogLevel LogLevel { get; set; }
public int ThreadId { get; set; } = Environment.CurrentManagedThreadId;
public int ThreadId { get; set; }
public string? CategoryName { get; set; }
public string? CallerName { get; set; }
public string? Text { get; set; }
public string? ErrorType { get; set; }
public string? Exception { get; set; }
public override string? ToString() => Text ?? base.ToString();
//public string ErrorText() => string.IsNullOrWhiteSpace(ErrorType) ? string.Empty : $"{AcEnv.NL}[{ErrorType.ToUpper()}]: {Exception}";
//public string ToMinimalText() => $"{"[" + CategoryName + "->" + CallerName + "]"} - {"[" + ThreadId + "]", 5} {Text}{ErrorText()}";
//public string ToNormalText()
// => $"{"[" + LogLevel + "]",-9} {"[" + CategoryName + "->" + CallerName + "]"} - {"[" + ThreadId + "]", 5} {Text}{ErrorText()}";
//public string ToDetailText()
// => $"[{TimeStampUtc.ToLocalTime():HH:mm:ss.fff}] {"[" + LogLevel + "]",-9} {"[" + CategoryName + "->" + CallerName + "]", -55} {"[" + ThreadId + "]", 5} {Text}{ErrorText()}";
//public string ToDiagnosticText()
// => $"[{TimeStampUtc.ToLocalTime():HH:mm:ss.fff}] [{AppType.ToString()[0]}] {"[" + LogLevel + "]",-9} {"[" + CategoryName + "->" + CallerName + "]", -54} {"[" + ThreadId + "]", 5} {Text}{ErrorText()}";
}

6
AyCode.Core/Loggers/IAcLogItemClient.cs → AyCode.Entities/LogItems/IAcLogItemClient.cs
View File

@ -1,11 +1,11 @@
using AyCode.Core.Enums;
using AyCode.Core.Loggers;
using AyCode.Interfaces.Entities;
namespace AyCode.Core.Loggers;
namespace AyCode.Entities.LogItems;
public interface IAcLogItemClient
{
public DateTime TimeStampUtc { get; set; }
public AppType AppType { get; set; }
public LogLevel LogLevel { get; set; }
public int ThreadId { get; set; }

2
AyCode.Services.Server.Tests/AyCode.Services.Server.Tests.csproj
View File

@ -14,7 +14,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />

2
AyCode.Services.Server/AyCode.Services.Server.csproj
View File

@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.4" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="SendGrid" Version="9.29.3" />
</ItemGroup>

2
AyCode.Services/AyCode.Services.csproj
View File

@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
</ItemGroup>
<ItemGroup>

46
AyCode.Services/Loggers/AcHttpClientLogItemWriter.cs
View File

@ -1,56 +1,36 @@
using AyCode.Core.Enums;
using AyCode.Core.Loggers;
using AyCode.Entities;
using System.Net;
using System.Net.Http.Json;
using AyCode.Core.Helpers;
using AyCode.Entities.LogItems;
using AyCode.Interfaces.Entities;
using static System.Net.WebRequestMethods;
using System;
namespace AyCode.Services.Loggers;
public abstract class AcHttpClientLogItemWriter<TLogItem> : AcLogItemWriterBase<TLogItem>, IAcLogWriterClientBase where TLogItem : class, IAcLogItemClient
public abstract class AcHttpClientLogItemWriter<TLogItem> : AcLogItemWriterBase<TLogItem> where TLogItem : class, IAcLogItemClient
{
protected string _url;
protected HttpClient _httpClient;
protected HttpClientHandler _httpClientHandler;
protected readonly HttpClientHandler _httpClientHandler;
protected AcHttpClientLogItemWriter(HttpClient httpClient, string url) : base(AppType.Web, LogLevel.Detail)
protected AcHttpClientLogItemWriter(HttpClient httpClient) : base(AppType.Web, LogLevel.Detail)
{
//_httpClient = httpClient;
_url = url;
Initialize(httpClient.BaseAddress, httpClient.DefaultRequestVersion, httpClient.DefaultVersionPolicy);
_httpClient = httpClient;
}
protected AcHttpClientLogItemWriter(string url, string? categoryName = null) : base(categoryName)
{
_url = url;
Initialize(null, HttpVersion.Version20, HttpVersionPolicy.RequestVersionOrHigher);
}
protected AcHttpClientLogItemWriter(string url, AppType appType, LogLevel logLevel, string? categoryName = null) : base(appType, logLevel, categoryName)
{
_url = url;
Initialize(null, HttpVersion.Version20, HttpVersionPolicy.RequestVersionOrHigher);
}
private void Initialize(Uri? baseAddress, Version defaultRequestVersion, HttpVersionPolicy defaultVersionPolicy)
protected AcHttpClientLogItemWriter(string? categoryName = null) : base(categoryName)
{
_httpClientHandler = new HttpClientHandler();
_httpClient = new HttpClient(_httpClientHandler, false);
_httpClient.BaseAddress = baseAddress;
_httpClient.DefaultRequestVersion = defaultRequestVersion;
_httpClient.DefaultVersionPolicy = defaultVersionPolicy;
}
public override void Write(AppType appType, LogLevel logLevel, string? logText, string? callerMemberName, string? categoryName, string? errorType, string? exMessage)
=> WriteLogItem(CreateLogItem(DateTime.UtcNow, appType, Environment.CurrentManagedThreadId, logLevel, logText, callerMemberName, categoryName, errorType, exMessage));
protected override void WriteLogItemCallback(TLogItem logItem)
protected AcHttpClientLogItemWriter(AppType appType, LogLevel logLevel, string? categoryName = null) : base(appType, logLevel, categoryName)
{
//logItem.ThreadId = Environment.CurrentManagedThreadId;
_httpClient.PostAsJsonAsync(_url, logItem).Forget();
_httpClientHandler = new HttpClientHandler();
_httpClient = new HttpClient(_httpClientHandler, false);
}
//protected override void WriteLogItem(TLogItem logItem, Action? callback = null)
//{
// //throw new NotImplementedException();

6
AyCode.Services/Loggers/IAcLogWriterClientBase.cs
View File

@ -1,6 +0,0 @@
using AyCode.Core.Loggers;
namespace AyCode.Services.Loggers;
public interface IAcLogWriterClientBase : IAcLogWriterBase
{}

2
AyCode.Utils/AyCode.Utils.csproj
View File

@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
<PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.4" />
</ItemGroup>
<ItemGroup>