diff --git a/Visual Studio 2022/Visualizers/attribcache140.bin b/Visual Studio 2022/Visualizers/attribcache140.bin new file mode 100644 index 0000000..ebdbcf5 Binary files /dev/null and b/Visual Studio 2022/Visualizers/attribcache140.bin differ diff --git a/src/01/02/Host/KSociety.Log.Srv.Host/AutoMapperProfile/DataProfile.cs b/src/01/02/Host/KSociety.Log.Srv.Host/AutoMapperProfile/DataProfile.cs index 8ff7451..01b70ba 100644 --- a/src/01/02/Host/KSociety.Log.Srv.Host/AutoMapperProfile/DataProfile.cs +++ b/src/01/02/Host/KSociety.Log.Srv.Host/AutoMapperProfile/DataProfile.cs @@ -1,14 +1,14 @@ -namespace KSociety.Log.Srv.Host.AutoMapperProfile -{ - using AutoMapper; - using KSociety.Log.App.Dto.Req.Biz; - using KSociety.Log.Biz.Event; +//namespace KSociety.Log.Srv.Host.AutoMapperProfile +//{ +// using AutoMapper; +// using KSociety.Log.App.Dto.Req.Biz; +// using KSociety.Log.Biz.Event; - public class DataProfile : Profile - { - public DataProfile() - { - this.CreateMap(); - } - } -} \ No newline at end of file +// public class DataProfile : Profile +// { +// public DataProfile() +// { +// this.CreateMap(); +// } +// } +//} diff --git a/src/01/02/Host/KSociety.Log.Srv.Host/KSociety.Log.Srv.Host.csproj b/src/01/02/Host/KSociety.Log.Srv.Host/KSociety.Log.Srv.Host.csproj index d1d3488..992e0dc 100644 --- a/src/01/02/Host/KSociety.Log.Srv.Host/KSociety.Log.Srv.Host.csproj +++ b/src/01/02/Host/KSociety.Log.Srv.Host/KSociety.Log.Srv.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/01/02/Host/KSociety.Log.Srv.Host/Startup.cs b/src/01/02/Host/KSociety.Log.Srv.Host/Startup.cs index c5146b9..91c906d 100644 --- a/src/01/02/Host/KSociety.Log.Srv.Host/Startup.cs +++ b/src/01/02/Host/KSociety.Log.Srv.Host/Startup.cs @@ -1,4 +1,4 @@ -namespace KSociety.Log.Srv.Host +namespace KSociety.Log.Srv.Host { using Autofac; using KSociety.Base.EventBus; @@ -67,8 +67,8 @@ public void ConfigureContainer(ContainerBuilder builder) builder.RegisterModule(new KSociety.Base.Srv.Host.Shared.Bindings.Log()); //AutoMapper. - builder.RegisterModule( - new KSociety.Base.Srv.Host.Shared.Bindings.AutoMapper(AssemblyTool.GetAssembly())); + //builder.RegisterModule( + // new KSociety.Base.Srv.Host.Shared.Bindings.AutoMapper(AssemblyTool.GetAssembly())); //CommandHdlr. builder.RegisterModule(new CommandHdlr(AssemblyTool.GetAssembly())); @@ -155,4 +155,4 @@ private static void OnStopped() Console.WriteLine(@"OnStopped: "); } } -} \ No newline at end of file +} diff --git a/src/01/02/KSociety.Log.Srv.Agent/KSociety.Log.Srv.Agent.csproj b/src/01/02/KSociety.Log.Srv.Agent/KSociety.Log.Srv.Agent.csproj index 6964cb9..13b3b49 100644 --- a/src/01/02/KSociety.Log.Srv.Agent/KSociety.Log.Srv.Agent.csproj +++ b/src/01/02/KSociety.Log.Srv.Agent/KSociety.Log.Srv.Agent.csproj @@ -4,11 +4,14 @@ + + netstandard2.0 true + disable - + diff --git a/src/01/02/KSociety.Log.Srv.Behavior/KSociety.Log.Srv.Behavior.csproj b/src/01/02/KSociety.Log.Srv.Behavior/KSociety.Log.Srv.Behavior.csproj index 4d9569a..147ce13 100644 --- a/src/01/02/KSociety.Log.Srv.Behavior/KSociety.Log.Srv.Behavior.csproj +++ b/src/01/02/KSociety.Log.Srv.Behavior/KSociety.Log.Srv.Behavior.csproj @@ -4,11 +4,14 @@ + + netstandard2.0 true + disable - + diff --git a/src/01/02/KSociety.Log.Srv.Contract/KSociety.Log.Srv.Contract.csproj b/src/01/02/KSociety.Log.Srv.Contract/KSociety.Log.Srv.Contract.csproj index df7e989..c8605c8 100644 --- a/src/01/02/KSociety.Log.Srv.Contract/KSociety.Log.Srv.Contract.csproj +++ b/src/01/02/KSociety.Log.Srv.Contract/KSociety.Log.Srv.Contract.csproj @@ -4,7 +4,10 @@ + + netstandard2.0 true + disable diff --git a/src/01/02/KSociety.Log.Srv.Dto/KSociety.Log.Srv.Dto.csproj b/src/01/02/KSociety.Log.Srv.Dto/KSociety.Log.Srv.Dto.csproj index 0cb70df..c1f00f0 100644 --- a/src/01/02/KSociety.Log.Srv.Dto/KSociety.Log.Srv.Dto.csproj +++ b/src/01/02/KSociety.Log.Srv.Dto/KSociety.Log.Srv.Dto.csproj @@ -4,7 +4,10 @@ + + netstandard2.0 true + disable diff --git a/src/01/03/KSociety.Log.App.Dto/KSociety.Log.App.Dto.csproj b/src/01/03/KSociety.Log.App.Dto/KSociety.Log.App.Dto.csproj index df0410d..938c430 100644 --- a/src/01/03/KSociety.Log.App.Dto/KSociety.Log.App.Dto.csproj +++ b/src/01/03/KSociety.Log.App.Dto/KSociety.Log.App.Dto.csproj @@ -4,11 +4,14 @@ - true + + netstandard2.0 + true + disable - + diff --git a/src/01/03/KSociety.Log.App.ReqHdlr/Biz/WriteLogReqHdlr.cs b/src/01/03/KSociety.Log.App.ReqHdlr/Biz/WriteLogReqHdlr.cs index 0504d9a..21cc786 100644 --- a/src/01/03/KSociety.Log.App.ReqHdlr/Biz/WriteLogReqHdlr.cs +++ b/src/01/03/KSociety.Log.App.ReqHdlr/Biz/WriteLogReqHdlr.cs @@ -1,9 +1,8 @@ -namespace KSociety.Log.App.ReqHdlr.Biz +namespace KSociety.Log.App.ReqHdlr.Biz { using System; using System.Threading; using System.Threading.Tasks; - using AutoMapper; using KSociety.Base.App.Shared; using KSociety.Log.App.Dto.Req.Biz; using KSociety.Log.Biz.Event; @@ -17,14 +16,12 @@ public class WriteLogReqHdlr : private readonly ILoggerFactory _loggerFactory; private readonly ILogger _logger; private readonly IBiz _biz; - private readonly IMapper _mapper; - public WriteLogReqHdlr(ILoggerFactory loggerFactory, IBiz biz, IMapper mapper) + public WriteLogReqHdlr(ILoggerFactory loggerFactory, IBiz biz) { this._loggerFactory = loggerFactory; this._logger = this._loggerFactory.CreateLogger(); this._biz = biz; - this._mapper = mapper; } public Dto.Res.Biz.WriteLog Execute(WriteLog request) @@ -33,7 +30,7 @@ public Dto.Res.Biz.WriteLog Execute(WriteLog request) try { - var message = this._mapper.Map(request); + var message = new WriteLogEvent(request.Message, request.TimeStamp, request.SequenceId, request.Level, request.LoggerName);//this._mapper.Map(request); this._biz.WriteLog(message); } catch (Exception ex) @@ -51,7 +48,7 @@ public Dto.Res.Biz.WriteLog Execute(WriteLog request) try { - var message = this._mapper.Map(request); + var message = new WriteLogEvent(request.Message, request.TimeStamp, request.SequenceId, request.Level, request.LoggerName);//this._mapper.Map(request); await this._biz.WriteLogAsync(message).ConfigureAwait(false); } catch (Exception ex) @@ -62,4 +59,4 @@ public Dto.Res.Biz.WriteLog Execute(WriteLog request) return output; } } -} \ No newline at end of file +} diff --git a/src/01/03/KSociety.Log.App.ReqHdlr/Biz/WriteLogsReqHdlr.cs b/src/01/03/KSociety.Log.App.ReqHdlr/Biz/WriteLogsReqHdlr.cs index 7e1f805..70f219b 100644 --- a/src/01/03/KSociety.Log.App.ReqHdlr/Biz/WriteLogsReqHdlr.cs +++ b/src/01/03/KSociety.Log.App.ReqHdlr/Biz/WriteLogsReqHdlr.cs @@ -1,10 +1,9 @@ -namespace KSociety.Log.App.ReqHdlr.Biz +namespace KSociety.Log.App.ReqHdlr.Biz { using System; using System.Linq; using System.Threading; using System.Threading.Tasks; - using AutoMapper; using KSociety.Base.App.Shared; using KSociety.Log.App.Dto.Req.Biz; using KSociety.Log.Biz.Event; @@ -18,14 +17,12 @@ public class WriteLogsReqHdlr : private readonly ILoggerFactory _loggerFactory; private readonly ILogger _logger; private readonly IBiz _biz; - private readonly IMapper _mapper; - public WriteLogsReqHdlr(ILoggerFactory loggerFactory, IBiz biz, IMapper mapper) + public WriteLogsReqHdlr(ILoggerFactory loggerFactory, IBiz biz) { this._loggerFactory = loggerFactory; this._logger = this._loggerFactory.CreateLogger(); this._biz = biz; - this._mapper = mapper; } public Dto.Res.Biz.WriteLog Execute(Dto.Req.Biz.List.WriteLog request) @@ -34,7 +31,7 @@ public Dto.Res.Biz.WriteLog Execute(Dto.Req.Biz.List.WriteLog request) try { - var list = request.List.Select(message => this._mapper.Map(message)).ToList(); + var list = request.List.Select(message => new WriteLogEvent(message.Message, message.TimeStamp, message.SequenceId, message.Level, message.LoggerName) /*this._mapper.Map(message)*/).ToList(); this._biz.WriteLogs(list); } catch (Exception ex) @@ -52,7 +49,7 @@ public Dto.Res.Biz.WriteLog Execute(Dto.Req.Biz.List.WriteLog request) try { - var list = request.List.Select(message => this._mapper.Map(message)).ToList(); + var list = request.List.Select(message => new WriteLogEvent(message.Message, message.TimeStamp, message.SequenceId, message.Level, message.LoggerName)).ToList(); await this._biz.WriteLogsAsync(list).ConfigureAwait(false); } catch (Exception ex) @@ -63,4 +60,4 @@ public Dto.Res.Biz.WriteLog Execute(Dto.Req.Biz.List.WriteLog request) return output; } } -} \ No newline at end of file +} diff --git a/src/01/03/KSociety.Log.App.ReqHdlr/KSociety.Log.App.ReqHdlr.csproj b/src/01/03/KSociety.Log.App.ReqHdlr/KSociety.Log.App.ReqHdlr.csproj index c00fab7..aabbe3b 100644 --- a/src/01/03/KSociety.Log.App.ReqHdlr/KSociety.Log.App.ReqHdlr.csproj +++ b/src/01/03/KSociety.Log.App.ReqHdlr/KSociety.Log.App.ReqHdlr.csproj @@ -4,13 +4,12 @@ - true + + netstandard2.0 + true + disable - - - - diff --git a/src/01/04/KSociety.Log.Biz.Event/KSociety.Log.Biz.Event.csproj b/src/01/04/KSociety.Log.Biz.Event/KSociety.Log.Biz.Event.csproj index 4ee110c..29e2f69 100644 --- a/src/01/04/KSociety.Log.Biz.Event/KSociety.Log.Biz.Event.csproj +++ b/src/01/04/KSociety.Log.Biz.Event/KSociety.Log.Biz.Event.csproj @@ -1,14 +1,17 @@ - + + + netstandard2.0 true + disable - + diff --git a/src/01/04/KSociety.Log.Biz/KSociety.Log.Biz.csproj b/src/01/04/KSociety.Log.Biz/KSociety.Log.Biz.csproj index 786f4ed..ee6a1bc 100644 --- a/src/01/04/KSociety.Log.Biz/KSociety.Log.Biz.csproj +++ b/src/01/04/KSociety.Log.Biz/KSociety.Log.Biz.csproj @@ -4,11 +4,14 @@ - true + + netstandard2.0 + true + disable - + diff --git a/src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq/KSociety.Log.Serilog.Sinks.RabbitMq.csproj b/src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq/KSociety.Log.Serilog.Sinks.RabbitMq.csproj index 876c7d2..2f4d1da 100644 --- a/src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq/KSociety.Log.Serilog.Sinks.RabbitMq.csproj +++ b/src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq/KSociety.Log.Serilog.Sinks.RabbitMq.csproj @@ -1,14 +1,17 @@ - + - true + + netstandard2.0 + true + disable - + diff --git a/src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq/Sinks/RabbitMq/RabbitMqBatchedSink.cs b/src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq/Sinks/RabbitMq/RabbitMqBatchedSink.cs index efe3e09..8ab132e 100644 --- a/src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq/Sinks/RabbitMq/RabbitMqBatchedSink.cs +++ b/src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq/Sinks/RabbitMq/RabbitMqBatchedSink.cs @@ -1,4 +1,4 @@ -namespace KSociety.Log.Serilog.Sinks.RabbitMq.Sinks.RabbitMq +namespace KSociety.Log.Serilog.Sinks.RabbitMq.Sinks.RabbitMq { using KSociety.Base.EventBus; using KSociety.Base.EventBus.Abstractions.EventBus; @@ -47,13 +47,20 @@ RabbitMqSinkConfiguration rabbitMqSinkConfiguration public void Initialize() { - this._eventBus = new Lazy(new EventBusRabbitMqTyped( + this._eventBus = new Lazy(this.GetEventBusTyped); + this._eventBus.Value.Initialize(); + } + + private IEventBusTyped GetEventBusTyped() + { + var eventBus = new EventBusRabbitMqTyped( this._persistentConnection, this._loggerFactory, null, this._eventBusParameters, - "LogQueueDriver")); - this._eventBus.Value.Initialize(); + "LogQueueDriver"); + + return eventBus; } public async Task EmitBatchAsync(IEnumerable batch) @@ -84,4 +91,4 @@ public Task OnEmptyBatchAsync() return Task.CompletedTask; } } -} \ No newline at end of file +} diff --git a/src/01/Sink/KSociety.Log.Serilog.Sinks.SignalR/KSociety.Log.Serilog.Sinks.SignalR.csproj b/src/01/Sink/KSociety.Log.Serilog.Sinks.SignalR/KSociety.Log.Serilog.Sinks.SignalR.csproj index e29347a..6ded31c 100644 --- a/src/01/Sink/KSociety.Log.Serilog.Sinks.SignalR/KSociety.Log.Serilog.Sinks.SignalR.csproj +++ b/src/01/Sink/KSociety.Log.Serilog.Sinks.SignalR/KSociety.Log.Serilog.Sinks.SignalR.csproj @@ -8,7 +8,7 @@ - +