Skip to content

Commit 63e95b9

Browse files
merblamerbla
authored
Merge pull request #81 from serilog/dev
Release 2.5.0
2 parents 977dabb + 236f82e commit 63e95b9

File tree

4 files changed

+38
-19
lines changed

4 files changed

+38
-19
lines changed

‎sample/Sample/Sample.csproj

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,19 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.0</TargetFramework>
5+
<TargetFrameworks>netcoreapp2.0;net47</TargetFrameworks>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Serilog" Version="2.5.0" />
10-
<PackageReference Include="Serilog.Sinks.Console" Version="3.0.1" />
9+
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.0" />
10+
</ItemGroup>
11+
12+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
13+
<PackageReference Include="System.Net.Http" Version="4.3.2" />
14+
</ItemGroup>
15+
16+
<ItemGroup Condition=" '$(TargetFramework)' == 'net47' ">
17+
<Reference Include="System.Net.Http" />
1118
</ItemGroup>
1219

1320
<ItemGroup>

‎src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>The Splunk Sink for Serilog</Description>
5-
<VersionPrefix>2.4.0</VersionPrefix>
5+
<VersionPrefix>2.5.0</VersionPrefix>
66
<Authors>Matthew Erbs, Serilog Contributors</Authors>
77
<TargetFrameworks>net45;netstandard1.1;netstandard1.3</TargetFrameworks>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -15,29 +15,29 @@
1515
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
1616
</PropertyGroup>
1717

18+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
19+
<DefineConstants>$(DefineConstants);TCP;UDP</DefineConstants>
20+
</PropertyGroup>
21+
1822
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
1923
<PackageReference Include="Splunk.Logging.Common" Version="1.6.0" />
2024
<Reference Include="System.Net.Http" />
2125
<Reference Include="System" />
2226
<Reference Include="Microsoft.CSharp" />
2327
</ItemGroup>
2428

25-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
26-
<DefineConstants>$(DefineConstants);TCP;UDP</DefineConstants>
27-
</PropertyGroup>
2829

2930
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
30-
<PackageReference Include="System.Net.Http" Version="4.3.0" />
31+
<PackageReference Include="System.Net.Http" Version="4.3.2" />
3132
</ItemGroup>
3233

3334
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
34-
<PackageReference Include="System.Net.Http" Version="4.3.0" />
35+
<PackageReference Include="System.Net.Http" Version="4.3.2" />
3536
</ItemGroup>
3637

3738
<ItemGroup>
3839
<PackageReference Include="Serilog" Version="2.5.0" />
3940
<PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="2.1.1" />
40-
<PackageReference Include="System.Net.Http" Version="4.3.2" />
4141
</ItemGroup>
4242

4343
</Project>

‎src/Serilog.Sinks.Splunk/SplunkLoggingConfigurationExtensions.cs

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
using System;
1717
using System.Net.Http;
1818
using Serilog.Configuration;
19+
using Serilog.Core;
1920
using Serilog.Events;
2021
using Serilog.Formatting;
2122
using Serilog.Sinks.Splunk;
@@ -53,6 +54,7 @@ public static class SplunkLoggingConfigurationExtensions
5354
/// <param name="batchIntervalInSeconds">The interval in seconds that the queue should be instpected for batching</param>
5455
/// <param name="batchSizeLimit">The size of the batch</param>
5556
/// <param name="messageHandler">The handler used to send HTTP requests</param>
57+
/// <param name="levelSwitch">A switch allowing the pass-through minimum level to be changed at runtime.</param>
5658
/// <returns></returns>
5759
public static LoggerConfiguration EventCollector(
5860
this LoggerSinkConfiguration configuration,
@@ -69,7 +71,8 @@ public static LoggerConfiguration EventCollector(
6971
bool renderTemplate = true,
7072
int batchIntervalInSeconds = 2,
7173
int batchSizeLimit = 100,
72-
HttpMessageHandler messageHandler = null)
74+
HttpMessageHandler messageHandler = null,
75+
LoggingLevelSwitch levelSwitch = null)
7376
{
7477
if (configuration == null) throw new ArgumentNullException(nameof(configuration));
7578
if (outputTemplate == null) throw new ArgumentNullException(nameof(outputTemplate));
@@ -88,7 +91,7 @@ public static LoggerConfiguration EventCollector(
8891
renderTemplate,
8992
messageHandler);
9093

91-
return configuration.Sink(eventCollectorSink, restrictedToMinimumLevel);
94+
return configuration.Sink(eventCollectorSink, restrictedToMinimumLevel, levelSwitch);
9295
}
9396

9497
/// <summary>
@@ -104,6 +107,7 @@ public static LoggerConfiguration EventCollector(
104107
/// <param name="batchIntervalInSeconds">The interval in seconds that the queue should be instpected for batching</param>
105108
/// <param name="batchSizeLimit">The size of the batch</param>
106109
/// <param name="messageHandler">The handler used to send HTTP requests</param>
110+
/// <param name="levelSwitch">A switch allowing the pass-through minimum level to be changed at runtime.</param>
107111
/// <returns></returns>
108112
public static LoggerConfiguration EventCollector(
109113
this LoggerSinkConfiguration configuration,
@@ -115,7 +119,8 @@ public static LoggerConfiguration EventCollector(
115119
string outputTemplate = DefaultOutputTemplate,
116120
int batchIntervalInSeconds = 2,
117121
int batchSizeLimit = 100,
118-
HttpMessageHandler messageHandler = null)
122+
HttpMessageHandler messageHandler = null,
123+
LoggingLevelSwitch levelSwitch = null)
119124
{
120125
if (configuration == null) throw new ArgumentNullException(nameof(configuration));
121126
if (jsonFormatter == null) throw new ArgumentNullException(nameof(jsonFormatter));
@@ -130,10 +135,10 @@ public static LoggerConfiguration EventCollector(
130135
jsonFormatter,
131136
messageHandler);
132137

133-
return configuration.Sink(eventCollectorSink, restrictedToMinimumLevel);
138+
return configuration.Sink(eventCollectorSink, restrictedToMinimumLevel, levelSwitch);
134139
}
135140

136-
141+
137142
/// <summary>
138143
/// Adds a sink that writes log events as to a Splunk instance via the HTTP Event Collector.
139144
/// </summary>
@@ -152,6 +157,7 @@ public static LoggerConfiguration EventCollector(
152157
/// <param name="batchIntervalInSeconds">The interval in seconds that the queue should be instpected for batching</param>
153158
/// <param name="batchSizeLimit">The size of the batch</param>
154159
/// <param name="messageHandler">The handler used to send HTTP requests</param>
160+
/// <param name="levelSwitch">A switch allowing the pass-through minimum level to be changed at runtime.</param>
155161
/// <param name="fields">Customfields that will be indexed in splunk with this event</param>
156162
/// <returns></returns>
157163
public static LoggerConfiguration EventCollector(
@@ -170,7 +176,8 @@ public static LoggerConfiguration EventCollector(
170176
bool renderTemplate = true,
171177
int batchIntervalInSeconds = 2,
172178
int batchSizeLimit = 100,
173-
HttpMessageHandler messageHandler = null)
179+
HttpMessageHandler messageHandler = null,
180+
LoggingLevelSwitch levelSwitch = null)
174181
{
175182
if (configuration == null) throw new ArgumentNullException(nameof(configuration));
176183
if (outputTemplate == null) throw new ArgumentNullException(nameof(outputTemplate));
@@ -191,7 +198,7 @@ public static LoggerConfiguration EventCollector(
191198
messageHandler
192199
);
193200

194-
return configuration.Sink(eventCollectorSink, restrictedToMinimumLevel);
201+
return configuration.Sink(eventCollectorSink, restrictedToMinimumLevel, levelSwitch);
195202
}
196203
}
197204
}

‎test/Serilog.Sinks.Splunk.Tests/Serilog.Sinks.Splunk.Tests.csproj

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,23 @@
1919
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
2020
<Reference Include="System" />
2121
<Reference Include="Microsoft.CSharp" />
22+
<Reference Include="System.Net.Http" />
2223
</ItemGroup>
2324

2425
<ItemGroup>
2526
<ProjectReference Include="..\..\src\Serilog.Sinks.Splunk\Serilog.Sinks.Splunk.csproj" />
2627
</ItemGroup>
2728

2829
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
29-
<PackageReference Include="System.Net.Http" Version="4.3.0" />
30+
<PackageReference Include="System.Net.Http" Version="4.3.2" />
3031
</ItemGroup>
3132

3233
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
33-
<PackageReference Include="System.Net.Http" Version="4.3.0" />
34+
<PackageReference Include="System.Net.Http" Version="4.3.2" />
35+
</ItemGroup>
36+
37+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
38+
<PackageReference Include="System.Net.Http" Version="4.3.2" />
3439
</ItemGroup>
3540

3641
<ItemGroup>

0 commit comments

Comments
 (0)