Structured logging (#761)

* Replace self-written logging abstraction with LibLog * Change logging to structural
EasyNetQ · Apr 13, 2018 · 3b7335b · 3b7335b
1 parent ef0f0cd
commit 3b7335b
Show file tree

Hide file tree

Showing 88 changed files with 5,468 additions and 958 deletions.
diff --git a/Build/EasyNetQ.proj b/Build/EasyNetQ.proj
@@ -85,8 +85,7 @@
         <ItemGroup>
             <ClientLibraries Include="$(Source)\EasyNetQ\EasyNetQ.csproj" />
             <ClientLibraries Include="$(Source)\EasyNetQ.DI.*\EasyNetQ.DI.*.csproj" Exclude="$(Source)\*Tests*\*.csproj" />
-            <ClientLibraries Include="$(Source)\EasyNetQ.Serilog\EasyNetQ.Serilog.csproj" />
-
+
             <FilesToDelete Include="$(NuGetPackageDirectory)\*.nupkg" />
         </ItemGroup>
 

diff --git a/Source/EasyNetQ.DI.Tests/MockBuilder.cs b/Source/EasyNetQ.DI.Tests/MockBuilder.cs
@@ -21,7 +21,6 @@ public class MockBuilder
         public List<IBasicConsumer> Consumers { get; } = new List<IBasicConsumer>();
         public IBasicProperties BasicProperties { get; } = new BasicProperties();
         public List<string> ConsumerQueueNames { get; } = new List<string>();
-        public IEasyNetQLogger Logger { get; } = Substitute.For<IEasyNetQLogger>();    
         public IBus Bus { get; private set; }
         public IServiceProvider ServiceProvider
         {
@@ -92,7 +91,6 @@ public MockBuilder(string connectionString, Action<IServiceRegister> registerSer
             {
                 registerServices(x);
                 x.Register(_ => ConnectionFactory);
-                x.Register(_ => Logger);
             });
 
             Assert.NotNull(Bus);

diff --git a/Source/EasyNetQ.DI.Tests/StructureMapAdapterWithRegistryTests.cs b/Source/EasyNetQ.DI.Tests/StructureMapAdapterWithRegistryTests.cs
@@ -50,47 +50,14 @@ public void Should_construct_registered_conventions()
             Assert.True(MyConventions.ConventionsCallCount > 0);
         }
 
-        [Fact]
-        public void Should_use_registered_logger()
-        {
-            Assert.True(MyLogger.ConstructorCallCount > 0);
-        }
-
         public class MessagingRegistry : Registry
         {
             public MessagingRegistry()
             {
-                For<IEasyNetQLogger>().Singleton().Use<MyLogger>();
                 For<IConventions>().Singleton().Use<MyConventions>();
             }
         }
 
-        public class MyLogger : IEasyNetQLogger
-        {
-            public MyLogger()
-            {
-                ConstructorCallCount++;
-            }
-
-            public void DebugWrite(string format, params object[] args)
-            {                
-            }
-
-            public void InfoWrite(string format, params object[] args)
-            {
-            }
-
-            public void ErrorWrite(string format, params object[] args)
-            {
-            }
-
-            public void ErrorWrite(Exception exception)
-            {
-            }
-
-            public static int ConstructorCallCount { get; private set; }
-        }
-
         public class MyConventions : IConventions
         {
             private readonly ITypeNameSerializer _typeNameSerializer;

diff --git a/Source/EasyNetQ.Scheduler.Mongo.Core/EasyNetQ.Scheduler.Mongo.Core.csproj b/Source/EasyNetQ.Scheduler.Mongo.Core/EasyNetQ.Scheduler.Mongo.Core.csproj
@@ -4,36 +4,29 @@
     <Description>EasyNetQ.Scheduler.Mongo.Core</Description>
     <TargetFrameworks>netstandard1.5;net451</TargetFrameworks>
   </PropertyGroup>
-
   <ItemGroup>
     <Compile Include="..\Version.cs" />
     <None Include="App.config" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\EasyNetQ\EasyNetQ.csproj" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="MongoDB.Bson" Version="2.3.0" />
     <PackageReference Include="mongocsharpdriver" Version="2.3.0" />
     <PackageReference Include="GitVersionTask" Version="4.0.0-beta0012">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
-
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
     <DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
   </PropertyGroup>
-
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
     <DefineConstants>$(DefineConstants);NETFX</DefineConstants>
   </PropertyGroup>
-
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />
-</Project>
+</Project>