diff --git a/Mango.Nop.Core/Loggers/ILogger.cs b/Mango.Nop.Core/Loggers/ILogger.cs new file mode 100644 index 0000000..ee05324 --- /dev/null +++ b/Mango.Nop.Core/Loggers/ILogger.cs @@ -0,0 +1,12 @@ +using AyCode.Core.Loggers; + +namespace Mango.Nop.Core.Loggers; + +public interface ILogger : ILogger +{ + +} +public interface ILogger : IAcLoggerBase +{ + +} \ No newline at end of file diff --git a/Mango.Nop.Core/Loggers/Logger.cs b/Mango.Nop.Core/Loggers/Logger.cs new file mode 100644 index 0000000..d492577 --- /dev/null +++ b/Mango.Nop.Core/Loggers/Logger.cs @@ -0,0 +1,32 @@ +using AyCode.Core.Enums; +using AyCode.Core.Loggers; + +namespace Mango.Nop.Core.Loggers; + +public class Logger : Logger, ILogger +{ + public Logger() : base(typeof(TCategory).Name) + { } + + public Logger(params IAcLogWriterBase[] logWriters) : base(typeof(TCategory).Name, logWriters) + { } + + public Logger(AppType appType, LogLevel logLevel, params IAcLogWriterBase[] logWriters) : base(appType, logLevel, typeof(TCategory).Name, logWriters) + { } +} + +public class Logger : AcLoggerBase, ILogger +{ + public Logger() : this(null) + { + } + + public Logger(string? categoryName) : base(categoryName) + { } + + public Logger(string? categoryName, params IAcLogWriterBase[] logWriters) : base(categoryName, logWriters) + { } + + public Logger(AppType appType, LogLevel logLevel, string? categoryName, params IAcLogWriterBase[] logWriters) : base(appType, logLevel, categoryName, logWriters) + { } +} \ No newline at end of file diff --git a/Mango.Nop.Core/Loggers/NopLogWriter.cs b/Mango.Nop.Core/Loggers/NopLogWriter.cs index 8c56681..7967ad6 100644 --- a/Mango.Nop.Core/Loggers/NopLogWriter.cs +++ b/Mango.Nop.Core/Loggers/NopLogWriter.cs @@ -1,28 +1,18 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using AyCode.Core.Enums; +using AyCode.Core.Helpers; using AyCode.Entities; using AyCode.Entities.Server.LogItems; -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Org.BouncyCastle.Utilities.IO; - -using Nop.Core.Domain.Logging; -using Nop.Services.Logging; using LogLevel = AyCode.Core.Loggers.LogLevel; namespace Mango.Nop.Core.Loggers { public class NopLogWriter : AcLogItemWriterBase//AcTextLogWriterBase { - private readonly ILogger _nopLogger; + private readonly global::Nop.Services.Logging.ILogger _nopLogger; - public NopLogWriter(ILogger nopLogger) : this(nopLogger, null) + public NopLogWriter(global::Nop.Services.Logging.ILogger nopLogger) : this(nopLogger, null) { } - public NopLogWriter(ILogger nopLogger, string? categoryName = null) : base(categoryName) + public NopLogWriter(global::Nop.Services.Logging.ILogger nopLogger, string? categoryName = null) : base(categoryName) { _nopLogger = nopLogger; } @@ -40,14 +30,14 @@ namespace Mango.Nop.Core.Loggers case LogLevel.Trace: case LogLevel.Debug: case LogLevel.Info: - _nopLogger.Information(logItem.Text); + _nopLogger.Information(logItem.Text);//.Forget(); break; case LogLevel.Suggest: case LogLevel.Warning: - _nopLogger.Warning(logItem.Text); + _nopLogger.Warning(logItem.Text);//.Forget(); break; case LogLevel.Error: - _nopLogger.Error(logItem.Text);//, logItem.Exception); + _nopLogger.Error(logItem.Text);//.Forget();//, logItem.Exception); break; case LogLevel.Disabled: break; diff --git a/Mango.Nop.Core/Repositories/MgDbContextBase.cs b/Mango.Nop.Core/Repositories/MgDbContextBase.cs index 9e5b11c..9493ae3 100644 --- a/Mango.Nop.Core/Repositories/MgDbContextBase.cs +++ b/Mango.Nop.Core/Repositories/MgDbContextBase.cs @@ -1,11 +1,12 @@ -using Mango.Nop.Core.Interfaces; +using AyCode.Core.Loggers; +using Mango.Nop.Core.Interfaces; +using Mango.Nop.Core.Loggers; using Microsoft.AspNetCore.Http; using Nop.Core.Caching; using Nop.Core.Domain.Catalog; using Nop.Core.Events; using Nop.Data; using Nop.Services.Events; -using Nop.Services.Logging; namespace Mango.Nop.Core.Repositories; @@ -21,9 +22,9 @@ public class MgDbContextBase : IMgDbContextBase protected INopDataProvider DataProvider; //protected IHttpContextAccessor HttpContextAccessor; - public MgDbContextBase(INopDataProvider dataProvider, ILogger logger) + public MgDbContextBase(INopDataProvider dataProvider, IEnumerable logWriters) { - Logger = logger; + Logger = new Logger(logWriters.ToArray()); DataProvider = dataProvider; } } \ No newline at end of file diff --git a/Mango.Nop.Services/MgEventConsumer.cs b/Mango.Nop.Services/MgEventConsumer.cs index 2d6d4ec..f64f238 100644 --- a/Mango.Nop.Services/MgEventConsumer.cs +++ b/Mango.Nop.Services/MgEventConsumer.cs @@ -1,10 +1,11 @@ -using Microsoft.AspNetCore.Http; +using AyCode.Core.Loggers; +using Mango.Nop.Core.Loggers; +using Microsoft.AspNetCore.Http; using Nop.Core.Domain.Catalog; using Nop.Core.Domain.Customers; using Nop.Core.Domain.Orders; using Nop.Core.Events; using Nop.Services.Events; -using Nop.Services.Logging; using Nop.Web.Framework.Events; namespace Mango.Nop.Services; @@ -12,7 +13,7 @@ namespace Mango.Nop.Services; /// /// Represents plugin event consumer /// -public class MgEventConsumer(IHttpContextAccessor httpContextAccessor, ILogger logger) : +public class MgEventConsumer(IHttpContextAccessor httpContextAccessor, IEnumerable logWriters) : IConsumer>, IConsumer, IConsumer, @@ -24,7 +25,7 @@ public class MgEventConsumer(IHttpContextAccessor httpContextAccessor, ILogger l { #region Fields - protected ILogger Logger { get; } = logger; + protected ILogger Logger { get; } = new Logger(logWriters.ToArray()); private readonly IHttpContextAccessor _httpContextAccessor = httpContextAccessor; #endregion