Merge pull request #81 from serilog/dev

Release 2.5.0
serilog-contrib · Jan 23, 2018 · 63e95b9 · 63e95b9
2 parents 977dabb + 236f82e
commit 63e95b9
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 19 deletions.
diff --git a/sample/Sample/Sample.csproj b/sample/Sample/Sample.csproj
@@ -2,12 +2,19 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFrameworks>netcoreapp2.0;net47</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.5.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="3.0.1" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+    <PackageReference Include="System.Net.Http" Version="4.3.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net47' ">
+    <Reference Include="System.Net.Http" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj b/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>The Splunk Sink for Serilog</Description>
-    <VersionPrefix>2.4.0</VersionPrefix>
+    <VersionPrefix>2.5.0</VersionPrefix>
     <Authors>Matthew Erbs, Serilog Contributors</Authors>
     <TargetFrameworks>net45;netstandard1.1;netstandard1.3</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -15,29 +15,29 @@
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
+    <DefineConstants>$(DefineConstants);TCP;UDP</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <PackageReference Include="Splunk.Logging.Common" Version="1.6.0" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <DefineConstants>$(DefineConstants);TCP;UDP</DefineConstants>
-  </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
-    <PackageReference Include="System.Net.Http" Version="4.3.0" />
+    <PackageReference Include="System.Net.Http" Version="4.3.2" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="System.Net.Http" Version="4.3.0" />
+    <PackageReference Include="System.Net.Http" Version="4.3.2" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Serilog" Version="2.5.0" />
     <PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="2.1.1" />
-    <PackageReference Include="System.Net.Http" Version="4.3.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Serilog.Sinks.Splunk/SplunkLoggingConfigurationExtensions.cs b/src/Serilog.Sinks.Splunk/SplunkLoggingConfigurationExtensions.cs
@@ -16,6 +16,7 @@
 using System;
 using System.Net.Http;
 using Serilog.Configuration;
+using Serilog.Core;
 using Serilog.Events;
 using Serilog.Formatting;
 using Serilog.Sinks.Splunk;
@@ -53,6 +54,7 @@ public static class SplunkLoggingConfigurationExtensions
         /// <param name="batchIntervalInSeconds">The interval in seconds that the queue should be instpected for batching</param>
         /// <param name="batchSizeLimit">The size of the batch</param>
         /// <param name="messageHandler">The handler used to send HTTP requests</param>
+        /// <param name="levelSwitch">A switch allowing the pass-through minimum level to be changed at runtime.</param>
         /// <returns></returns>
         public static LoggerConfiguration EventCollector(
             this LoggerSinkConfiguration configuration,
@@ -69,7 +71,8 @@ public static LoggerConfiguration EventCollector(
             bool renderTemplate = true,
             int batchIntervalInSeconds = 2,
             int batchSizeLimit = 100,
-            HttpMessageHandler messageHandler = null)
+            HttpMessageHandler messageHandler = null, 
+            LoggingLevelSwitch levelSwitch = null)
         {
             if (configuration == null) throw new ArgumentNullException(nameof(configuration));
             if (outputTemplate == null) throw new ArgumentNullException(nameof(outputTemplate));
@@ -88,7 +91,7 @@ public static LoggerConfiguration EventCollector(
                 renderTemplate,
                 messageHandler);
 
-            return configuration.Sink(eventCollectorSink, restrictedToMinimumLevel);
+            return configuration.Sink(eventCollectorSink, restrictedToMinimumLevel, levelSwitch);
         }
 
         /// <summary>
@@ -104,6 +107,7 @@ public static LoggerConfiguration EventCollector(
         /// <param name="batchIntervalInSeconds">The interval in seconds that the queue should be instpected for batching</param>
         /// <param name="batchSizeLimit">The size of the batch</param>
         /// <param name="messageHandler">The handler used to send HTTP requests</param>
+        /// <param name="levelSwitch">A switch allowing the pass-through minimum level to be changed at runtime.</param>
         /// <returns></returns>
         public static LoggerConfiguration EventCollector(
             this LoggerSinkConfiguration configuration,
@@ -115,7 +119,8 @@ public static LoggerConfiguration EventCollector(
             string outputTemplate = DefaultOutputTemplate,
             int batchIntervalInSeconds = 2,
             int batchSizeLimit = 100,
-            HttpMessageHandler messageHandler = null)
+            HttpMessageHandler messageHandler = null,
+            LoggingLevelSwitch levelSwitch = null)
         {
             if (configuration == null) throw new ArgumentNullException(nameof(configuration));
             if (jsonFormatter == null) throw new ArgumentNullException(nameof(jsonFormatter));
@@ -130,10 +135,10 @@ public static LoggerConfiguration EventCollector(
                 jsonFormatter,
                 messageHandler);
 
-            return configuration.Sink(eventCollectorSink, restrictedToMinimumLevel);
+            return configuration.Sink(eventCollectorSink, restrictedToMinimumLevel, levelSwitch);
         }
 
-       
+
         /// <summary>
         ///     Adds a sink that writes log events as to a Splunk instance via the HTTP Event Collector.
         /// </summary>
@@ -152,6 +157,7 @@ public static LoggerConfiguration EventCollector(
         /// <param name="batchIntervalInSeconds">The interval in seconds that the queue should be instpected for batching</param>
         /// <param name="batchSizeLimit">The size of the batch</param>
         /// <param name="messageHandler">The handler used to send HTTP requests</param>
+        /// <param name="levelSwitch">A switch allowing the pass-through minimum level to be changed at runtime.</param>
         /// <param name="fields">Customfields that will be indexed in splunk with this event</param>
         /// <returns></returns>
         public static LoggerConfiguration EventCollector(
@@ -170,7 +176,8 @@ public static LoggerConfiguration EventCollector(
             bool renderTemplate = true,
             int batchIntervalInSeconds = 2,
             int batchSizeLimit = 100,
-            HttpMessageHandler messageHandler = null)
+            HttpMessageHandler messageHandler = null,
+            LoggingLevelSwitch levelSwitch = null)
         {
             if (configuration == null) throw new ArgumentNullException(nameof(configuration));
             if (outputTemplate == null) throw new ArgumentNullException(nameof(outputTemplate));
@@ -191,7 +198,7 @@ public static LoggerConfiguration EventCollector(
                 messageHandler
                 );
 
-            return configuration.Sink(eventCollectorSink, restrictedToMinimumLevel);
+            return configuration.Sink(eventCollectorSink, restrictedToMinimumLevel, levelSwitch);
         }
     }
 }
diff --git a/test/Serilog.Sinks.Splunk.Tests/Serilog.Sinks.Splunk.Tests.csproj b/test/Serilog.Sinks.Splunk.Tests/Serilog.Sinks.Splunk.Tests.csproj
@@ -19,18 +19,23 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Net.Http" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Serilog.Sinks.Splunk\Serilog.Sinks.Splunk.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
-    <PackageReference Include="System.Net.Http" Version="4.3.0" />
+    <PackageReference Include="System.Net.Http" Version="4.3.2" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="System.Net.Http" Version="4.3.0" />
+    <PackageReference Include="System.Net.Http" Version="4.3.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+    <PackageReference Include="System.Net.Http" Version="4.3.2" />
   </ItemGroup>
 
   <ItemGroup>