Skip to content

Refactoring Logger #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Refactoring Logger #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b79b033
Merge pull request #1 from pjvds/master
sbiaudet Aug 17, 2016
10c5120
Refactoring logger manager
Aug 17, 2016
cccfa52
Removing log4net dependency
Aug 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ obj
bin
*.csproj.user
*.suo
.vs
TestResult.xml

# Resharper
Expand Down
4 changes: 0 additions & 4 deletions Extensions/src/Ncqrs.Config.StructureMap/Ncqrs.Config.StructureMap.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,6 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net">
<HintPath>..\..\..\lib\ThirdParty\log4net\log4net.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\..\lib\ThirdParty\json.net\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
Expand Down
12 changes: 12 additions & 0 deletions Extensions/src/Ncqrs.Config.Windsor/Ncqrs.Config.Windsor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,18 @@
<HintPath>..\..\..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Extensions.Logging, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Extensions.Logging.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
Expand Down
19 changes: 10 additions & 9 deletions Extensions/src/Ncqrs.Config.Windsor/WindsorInProcessEventBus.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
using Ncqrs.Eventing.ServiceModel.Bus;
using Castle.Core;
using Castle.Core.Internal;
using Microsoft.Extensions.Logging;

namespace Ncqrs.Config.Windsor
{
public class WindsorInProcessEventBus : IEventBus
{
static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
static readonly ILogger Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
readonly IWindsorContainer _container;

public WindsorInProcessEventBus(IWindsorContainer container)
Expand All @@ -25,7 +26,7 @@ public void Publish(IPublishableEvent eventMessage)
{
var eventMessageType = eventMessage.GetType();

Log.InfoFormat("Started publishing event {0}.", eventMessageType.FullName);
Log.LogDebug("Started publishing event {0}.", eventMessageType.FullName);

var handlers = GetHandlersForEvent(eventMessage).ToList();

Expand All @@ -34,7 +35,7 @@ public void Publish(IPublishableEvent eventMessage)

if (handlers.Count() == 0)
{
Log.WarnFormat("Did not found any handlers for event {0}.", eventMessageType.FullName);
Log.LogWarning("Did not found any handlers for event {0}.", eventMessageType.FullName);
}
else
{
Expand All @@ -46,26 +47,26 @@ public void Publish(IEnumerable<IPublishableEvent> eventMessages)
{
eventMessages.ForEach(Publish);
}

static void PublishToHandlers(dynamic eventMessage, Type eventMessageType, IEnumerable<dynamic> handlers)
{
Log.DebugFormat("Found {0} handlers for event {1}.", handlers.Count(), eventMessageType.FullName);
Log.LogDebug("Found {0} handlers for event {1}.", handlers.Count(), eventMessageType.FullName);

foreach (var handler in handlers)
{
Log.DebugFormat("Calling handler {0} for event {1}.", handler.GetType().FullName,
eventMessageType.FullName);
Log.LogDebug("Calling handler {0} for event {1}.", new object[] { handler.GetType().FullName,
eventMessageType.FullName});

handler.Handle(eventMessage);

Log.DebugFormat("Call finished.");
Log.LogDebug("Call finished.");
}
}

protected virtual IEnumerable<dynamic> GetHandlersForEvent(IPublishableEvent eventMessage)
{
var type = eventMessage.Payload.GetType();
var handlerType = typeof (IEventHandler<>).MakeGenericType(type);
var handlerType = typeof(IEventHandler<>).MakeGenericType(type);
var handlers = _container.ResolveAll(handlerType);
return handlers.Cast<dynamic>();
}
Expand Down
15 changes: 15 additions & 0 deletions Extensions/src/Ncqrs.Config.Windsor/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,19 @@
<packages>
<package id="Castle.Core" version="3.3.0" targetFramework="net452" />
<package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net452" />
<package id="Microsoft.Extensions.Logging" version="1.0.0" targetFramework="net452" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.0" targetFramework="net452" />
<package id="System.Collections" version="4.0.11" targetFramework="net452" />
<package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net452" />
<package id="System.ComponentModel" version="4.0.1" targetFramework="net452" />
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net452" />
<package id="System.Globalization" version="4.0.11" targetFramework="net452" />
<package id="System.Linq" version="4.1.0" targetFramework="net452" />
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net452" />
<package id="System.Reflection" version="4.1.0" targetFramework="net452" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net452" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net452" />
<package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net452" />
<package id="System.Threading" version="4.0.11" targetFramework="net452" />
</packages>
11 changes: 6 additions & 5 deletions ...s/src/Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot/AggregateDynamicSnapshotter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
using System.Text;
using Ncqrs.Domain.Storage;
using System.Reflection;
using Microsoft.Extensions.Logging;

namespace Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot
{
public class AggregateDynamicSnapshotter : IAggregateSnapshotter
{
private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILogger Log = LogManager.GetLogger< AggregateDynamicSnapshotter>();

private readonly IAggregateRootCreationStrategy _aggregateRootCreator;

Expand Down Expand Up @@ -38,19 +39,19 @@ public bool TryLoadFromSnapshot(Type aggregateRootType, Snapshot snapshot, Commi
{
try
{
Log.DebugFormat("Reconstructing aggregate root {0}[{1}] from snapshot", aggregateRootType.FullName,
Log.LogDebug("Reconstructing aggregate root {0}[{1}] from snapshot", aggregateRootType.FullName,
snapshot.EventSourceId.ToString("D"));
aggregateRoot = _aggregateRootCreator.CreateAggregateRoot(aggregateRootType);
aggregateRoot.InitializeFromSnapshot(snapshot);
aggregateRoot.RestoreFromSnapshot(snapshot.Payload);

Log.DebugFormat("Applying remaining historic event to reconstructed aggregate root {0}[{1}]",
Log.LogDebug("Applying remaining historic event to reconstructed aggregate root {0}[{1}]",
aggregateRootType.FullName, snapshot.EventSourceId.ToString("D"));
aggregateRoot.InitializeFromHistory(committedEventStream);
}
catch (Exception ex)
{
Log.ErrorFormat("Cannot load snapshot for '{0}' aggregate. {1}",
Log.LogError("Cannot load snapshot for '{0}' aggregate. {1}",
aggregateRoot.GetType().FullName, ex.Message);
aggregateRoot = null;
return false;
Expand All @@ -73,7 +74,7 @@ public bool TryTakeSnapshot(Domain.AggregateRoot aggregateRoot, out Snapshot sna
}
catch (Exception ex)
{
Log.ErrorFormat("Cannot take snapshot for '{0}' aggregate. {1}",
Log.LogError("Cannot take snapshot for '{0}' aggregate. {1}",
aggregateRoot.GetType().FullName, ex.Message);
snapshot = null;
return false;
Expand Down
12 changes: 12 additions & 0 deletions ....Snapshotting.DynamicSnapshot/Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,18 @@
<HintPath>..\..\..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Extensions.Logging, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Extensions.Logging.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
Expand Down
15 changes: 15 additions & 0 deletions Extensions/src/Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,19 @@
<packages>
<package id="Castle.Core" version="3.3.0" targetFramework="net452" />
<package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net452" />
<package id="Microsoft.Extensions.Logging" version="1.0.0" targetFramework="net452" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.0" targetFramework="net452" />
<package id="System.Collections" version="4.0.11" targetFramework="net452" />
<package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net452" />
<package id="System.ComponentModel" version="4.0.1" targetFramework="net452" />
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net452" />
<package id="System.Globalization" version="4.0.11" targetFramework="net452" />
<package id="System.Linq" version="4.1.0" targetFramework="net452" />
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net452" />
<package id="System.Reflection" version="4.1.0" targetFramework="net452" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net452" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net452" />
<package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net452" />
<package id="System.Threading" version="4.0.11" targetFramework="net452" />
</packages>
9 changes: 5 additions & 4 deletions Extensions/src/Ncqrs.Eventing.Storage.JOliver/JoesUnitOfWork.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
using Ncqrs.Domain.Storage;
using Ncqrs.Eventing.ServiceModel.Bus;
using Ncqrs.Eventing.Sourcing.Snapshotting;
using Microsoft.Extensions.Logging;

namespace Ncqrs.Eventing.Storage.JOliver
{
public class JoesUnitOfWork : UnitOfWorkBase
{
private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILogger Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

private readonly Guid _commitId;
private readonly List<AggregateRoot> _dirtyInstances = new List<AggregateRoot>();
Expand Down Expand Up @@ -105,15 +106,15 @@ protected override void Dispose(bool disposing)

public override void Accept()
{
Log.DebugFormat("Accepting unit of work {0}", this);
Log.LogDebug("Accepting unit of work {0}", this);
foreach (IEventStream trackedStream in _trackedStreams.Values)
{
trackedStream.CommitChanges(_commitId);
trackedStream.Dispose();
}
_trackedStreams.Clear();
Log.DebugFormat("Storing the event stream for command {0} to event store", _commitId);
Log.DebugFormat("Publishing events for command {0} to event bus", _commitId);
Log.LogDebug("Storing the event stream for command {0} to event store", _commitId);
Log.LogDebug("Publishing events for command {0} to event bus", _commitId);
_eventBus.Publish(_eventStream);
CreateSnapshots();
}
Expand Down
15 changes: 15 additions & 0 deletions Extensions/src/Ncqrs.Eventing.Storage.JOliver/Ncqrs.Eventing.Storage.JOliver.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,18 @@
<Reference Include="EventStore.Persistence.SqlPersistence">
<HintPath>..\..\..\lib\ThirdParty\EventStore\EventStore.Persistence.SqlPersistence.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Extensions.Logging, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Extensions.Logging.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -112,6 +124,9 @@
<Name>Ncqrs.EventBus</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
18 changes: 18 additions & 0 deletions Extensions/src/Ncqrs.Eventing.Storage.JOliver/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net451" />
<package id="Microsoft.Extensions.Logging" version="1.0.0" targetFramework="net451" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.0" targetFramework="net451" />
<package id="System.Collections" version="4.0.11" targetFramework="net451" />
<package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net451" />
<package id="System.ComponentModel" version="4.0.1" targetFramework="net451" />
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net451" />
<package id="System.Globalization" version="4.0.11" targetFramework="net451" />
<package id="System.Linq" version="4.1.0" targetFramework="net451" />
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net451" />
<package id="System.Reflection" version="4.1.0" targetFramework="net451" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net451" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net451" />
<package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net451" />
<package id="System.Threading" version="4.0.11" targetFramework="net451" />
</packages>
4 changes: 0 additions & 4 deletions ...ions/src/Ncqrs.Eventing.Storage.RavenDB.Tests/Ncqrs.Eventing.Storage.RavenDB.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@
<HintPath>..\..\..\lib\ThirdParty\RavenDB\ICSharpCode.NRefactory.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Lucene.Net, Version=2.9.1.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\ThirdParty\RavenDB\Lucene.Net.dll</HintPath>
Expand Down
2 changes: 0 additions & 2 deletions Extensions/src/Ncqrs.Eventing.Storage.RavenDB.Tests/RavenDBTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.IO;
using System.Reflection;
using log4net.Config;
using NUnit.Framework;
using Raven.Client.Document;
using Raven.Client.Embedded;
Expand All @@ -16,7 +15,6 @@ public abstract class RavenDBTestBase
[SetUp]
public void SetUpDocumentStore()
{
XmlConfigurator.Configure();
//_documentStore = ConnectToDocumentStore();
_documentStore = NewDocumentStore();
}
Expand Down
15 changes: 0 additions & 15 deletions Extensions/src/Ncqrs.Eventing.Storage.RavenDB.Tests/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
</configSections>
<connectionStrings>
<add name="Raven" connectionString="DataDir = .\TestDb" />
</connectionStrings>
<log4net>

<appender name="OutputDebugStringAppender" type="log4net.Appender.OutputDebugStringAppender">
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date [%thread] %-5level %logger [%property{NDC}] - %message%newline" />
</layout>
</appender>

<root>
<appender-ref ref="OutputDebugStringAppender" level="All" />
</root>
</log4net>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" /></startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
Expand Down
7 changes: 0 additions & 7 deletions Extensions/src/Ncqrs.Messaging.NServiceBus/Ncqrs.Messaging.NServiceBus.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Ncqrs">
<HintPath>..\..\..\lib\$(Configuration)\Ncqrs\Ncqrs.dll</HintPath>
<Private>False</Private>
Expand Down Expand Up @@ -88,9 +84,6 @@
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
4 changes: 0 additions & 4 deletions Extensions/src/Ncqrs.Messaging.NServiceBus/packages.config
View file
Open in desktop

This file was deleted.

Loading