Skip to content

Commit 48e4e05

Browse files
nblumhardtnblumhardt
committed
Fixed enrich syntax.
1 parent 5f08597 commit 48e4e05

File tree

5 files changed

+32
-130
lines changed

5 files changed

+32
-130
lines changed

‎sample/Sample/Program.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Threading.Tasks;
5-
using Microsoft.Extensions.Configuration;
1+
using Microsoft.Extensions.Configuration;
62
using Serilog;
73

84
namespace Sample

‎sample/Sample/appsettings.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@
77
{ "Name": "File", "Args": { "path": "%TEMP%\\Logs\\serilog-configuration-sample.txt" } }
88
],
99
"Enrich": {
10+
"With": [
11+
"FromLogContext",
12+
"WithMachineName",
13+
"WithThreadId"
14+
],
1015
"WithProperties": {
1116
"Application": "Sample"
12-
},
13-
"With": ["MachineName", "ThreadId", "ProcessId"]
17+
}
1418
}
1519
}
1620
}

‎sample/Sample/project.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"Serilog.Sinks.Literate": "2.0.0-beta-21",
1717
"Serilog.Sinks.File": "2.0.0-beta-507",
1818
"Serilog.Enrichers.Environment": "2.0.0-beta-507",
19-
"Serilog.Enrichers.Process": "2.0.0-beta-507",
2019
"Serilog.Enrichers.Thread": "2.0.0-beta-507"
2120
},
2221

‎sample/Sample/project.lock.json

Lines changed: 7 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -149,24 +149,6 @@
149149
"lib/net45/Serilog.Enrichers.Environment.dll": {}
150150
}
151151
},
152-
"Serilog.Enrichers.Process/2.0.0-beta-507": {
153-
"type": "package",
154-
"dependencies": {
155-
"Serilog": "2.0.0-beta-507"
156-
},
157-
"frameworkAssemblies": [
158-
"Microsoft.CSharp",
159-
"mscorlib",
160-
"System",
161-
"System.Core"
162-
],
163-
"compile": {
164-
"lib/net45/Serilog.Enrichers.Process.dll": {}
165-
},
166-
"runtime": {
167-
"lib/net45/Serilog.Enrichers.Process.dll": {}
168-
}
169-
},
170152
"Serilog.Enrichers.Thread/2.0.0-beta-507": {
171153
"type": "package",
172154
"dependencies": {
@@ -185,7 +167,7 @@
185167
"lib/net45/Serilog.Enrichers.Thread.dll": {}
186168
}
187169
},
188-
"Serilog.Settings.Configuration/1.0.0": {
170+
"Serilog.Settings.Configuration/2.0.0-beta": {
189171
"type": "project",
190172
"framework": ".NETFramework,Version=v4.5.1",
191173
"dependencies": {
@@ -400,19 +382,6 @@
400382
"lib/dotnet5.4/Serilog.Enrichers.Environment.dll": {}
401383
}
402384
},
403-
"Serilog.Enrichers.Process/2.0.0-beta-507": {
404-
"type": "package",
405-
"dependencies": {
406-
"Serilog": "2.0.0-beta-507",
407-
"System.Diagnostics.Process": "4.1.0-beta-23409"
408-
},
409-
"compile": {
410-
"lib/dotnet5.1/Serilog.Enrichers.Process.dll": {}
411-
},
412-
"runtime": {
413-
"lib/dotnet5.1/Serilog.Enrichers.Process.dll": {}
414-
}
415-
},
416385
"Serilog.Enrichers.Thread/2.0.0-beta-507": {
417386
"type": "package",
418387
"dependencies": {
@@ -425,7 +394,7 @@
425394
"lib/dotnet5.1/Serilog.Enrichers.Thread.dll": {}
426395
}
427396
},
428-
"Serilog.Settings.Configuration/1.0.0": {
397+
"Serilog.Settings.Configuration/2.0.0-beta": {
429398
"type": "project",
430399
"framework": ".NETPlatform,Version=v5.4",
431400
"dependencies": {
@@ -1082,24 +1051,6 @@
10821051
"lib/net45/Serilog.Enrichers.Environment.dll": {}
10831052
}
10841053
},
1085-
"Serilog.Enrichers.Process/2.0.0-beta-507": {
1086-
"type": "package",
1087-
"dependencies": {
1088-
"Serilog": "2.0.0-beta-507"
1089-
},
1090-
"frameworkAssemblies": [
1091-
"Microsoft.CSharp",
1092-
"mscorlib",
1093-
"System",
1094-
"System.Core"
1095-
],
1096-
"compile": {
1097-
"lib/net45/Serilog.Enrichers.Process.dll": {}
1098-
},
1099-
"runtime": {
1100-
"lib/net45/Serilog.Enrichers.Process.dll": {}
1101-
}
1102-
},
11031054
"Serilog.Enrichers.Thread/2.0.0-beta-507": {
11041055
"type": "package",
11051056
"dependencies": {
@@ -1118,7 +1069,7 @@
11181069
"lib/net45/Serilog.Enrichers.Thread.dll": {}
11191070
}
11201071
},
1121-
"Serilog.Settings.Configuration/1.0.0": {
1072+
"Serilog.Settings.Configuration/2.0.0-beta": {
11221073
"type": "project",
11231074
"framework": ".NETFramework,Version=v4.5.1",
11241075
"dependencies": {
@@ -1311,24 +1262,6 @@
13111262
"lib/net45/Serilog.Enrichers.Environment.dll": {}
13121263
}
13131264
},
1314-
"Serilog.Enrichers.Process/2.0.0-beta-507": {
1315-
"type": "package",
1316-
"dependencies": {
1317-
"Serilog": "2.0.0-beta-507"
1318-
},
1319-
"frameworkAssemblies": [
1320-
"Microsoft.CSharp",
1321-
"mscorlib",
1322-
"System",
1323-
"System.Core"
1324-
],
1325-
"compile": {
1326-
"lib/net45/Serilog.Enrichers.Process.dll": {}
1327-
},
1328-
"runtime": {
1329-
"lib/net45/Serilog.Enrichers.Process.dll": {}
1330-
}
1331-
},
13321265
"Serilog.Enrichers.Thread/2.0.0-beta-507": {
13331266
"type": "package",
13341267
"dependencies": {
@@ -1347,7 +1280,7 @@
13471280
"lib/net45/Serilog.Enrichers.Thread.dll": {}
13481281
}
13491282
},
1350-
"Serilog.Settings.Configuration/1.0.0": {
1283+
"Serilog.Settings.Configuration/2.0.0-beta": {
13511284
"type": "project",
13521285
"framework": ".NETFramework,Version=v4.5.1",
13531286
"dependencies": {
@@ -1721,19 +1654,6 @@
17211654
"lib/dotnet5.4/Serilog.Enrichers.Environment.dll": {}
17221655
}
17231656
},
1724-
"Serilog.Enrichers.Process/2.0.0-beta-507": {
1725-
"type": "package",
1726-
"dependencies": {
1727-
"Serilog": "2.0.0-beta-507",
1728-
"System.Diagnostics.Process": "4.1.0-beta-23409"
1729-
},
1730-
"compile": {
1731-
"lib/dotnet5.1/Serilog.Enrichers.Process.dll": {}
1732-
},
1733-
"runtime": {
1734-
"lib/dotnet5.1/Serilog.Enrichers.Process.dll": {}
1735-
}
1736-
},
17371657
"Serilog.Enrichers.Thread/2.0.0-beta-507": {
17381658
"type": "package",
17391659
"dependencies": {
@@ -1746,7 +1666,7 @@
17461666
"lib/dotnet5.1/Serilog.Enrichers.Thread.dll": {}
17471667
}
17481668
},
1749-
"Serilog.Settings.Configuration/1.0.0": {
1669+
"Serilog.Settings.Configuration/2.0.0-beta": {
17501670
"type": "project",
17511671
"framework": ".NETPlatform,Version=v5.4",
17521672
"dependencies": {
@@ -2641,19 +2561,6 @@
26412561
"lib/dotnet5.4/Serilog.Enrichers.Environment.dll": {}
26422562
}
26432563
},
2644-
"Serilog.Enrichers.Process/2.0.0-beta-507": {
2645-
"type": "package",
2646-
"dependencies": {
2647-
"Serilog": "2.0.0-beta-507",
2648-
"System.Diagnostics.Process": "4.1.0-beta-23409"
2649-
},
2650-
"compile": {
2651-
"lib/dotnet5.1/Serilog.Enrichers.Process.dll": {}
2652-
},
2653-
"runtime": {
2654-
"lib/dotnet5.1/Serilog.Enrichers.Process.dll": {}
2655-
}
2656-
},
26572564
"Serilog.Enrichers.Thread/2.0.0-beta-507": {
26582565
"type": "package",
26592566
"dependencies": {
@@ -2666,7 +2573,7 @@
26662573
"lib/dotnet5.1/Serilog.Enrichers.Thread.dll": {}
26672574
}
26682575
},
2669-
"Serilog.Settings.Configuration/1.0.0": {
2576+
"Serilog.Settings.Configuration/2.0.0-beta": {
26702577
"type": "project",
26712578
"framework": ".NETPlatform,Version=v5.4",
26722579
"dependencies": {
@@ -3235,7 +3142,7 @@
32353142
}
32363143
},
32373144
"libraries": {
3238-
"Serilog.Settings.Configuration/1.0.0": {
3145+
"Serilog.Settings.Configuration/2.0.0-beta": {
32393146
"type": "project",
32403147
"path": "../../src/Serilog.Settings.Configuration/project.json"
32413148
},
@@ -3611,19 +3518,6 @@
36113518
"Serilog.Enrichers.Environment.nuspec"
36123519
]
36133520
},
3614-
"Serilog.Enrichers.Process/2.0.0-beta-507": {
3615-
"type": "package",
3616-
"sha512": "GkTzBWzzTXiuUfR/Ywz0+BBe6C9+mgVDuXcsoqdv83+VFB52F/Ebdi8KwU5e4NIgpLtGRnHl16mSPtSAsjhk0A==",
3617-
"files": [
3618-
"lib/dotnet5.1/Serilog.Enrichers.Process.dll",
3619-
"lib/dotnet5.1/Serilog.Enrichers.Process.xml",
3620-
"lib/net45/Serilog.Enrichers.Process.dll",
3621-
"lib/net45/Serilog.Enrichers.Process.xml",
3622-
"Serilog.Enrichers.Process.2.0.0-beta-507.nupkg",
3623-
"Serilog.Enrichers.Process.2.0.0-beta-507.nupkg.sha512",
3624-
"Serilog.Enrichers.Process.nuspec"
3625-
]
3626-
},
36273521
"Serilog.Enrichers.Thread/2.0.0-beta-507": {
36283522
"type": "package",
36293523
"sha512": "TbdXA1ZMJ/ODfHcsKvuaUmae8FrBbj+zrK2bF7CZyTnk9cQXBMAYmrHfIoCt9vRq7R9N76SY0cEoU/b6Oucsag==",
@@ -5384,7 +5278,6 @@
53845278
"Serilog.Sinks.Literate >= 2.0.0-beta-21",
53855279
"Serilog.Sinks.File >= 2.0.0-beta-507",
53865280
"Serilog.Enrichers.Environment >= 2.0.0-beta-507",
5387-
"Serilog.Enrichers.Process >= 2.0.0-beta-507",
53885281
"Serilog.Enrichers.Thread >= 2.0.0-beta-507"
53895282
],
53905283
"DNX,Version=v4.5.1": [],

‎src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,23 @@ public void Configure(LoggerConfiguration loggerConfiguration)
2828
var configurationAssemblies = LoadConfigurationAssemblies();
2929

3030
ApplyMinimumLevel(loggerConfiguration);
31+
ApplyEnrichment(loggerConfiguration, configurationAssemblies);
32+
ApplySinks(loggerConfiguration, configurationAssemblies);
33+
}
34+
35+
void ApplySinks(LoggerConfiguration loggerConfiguration, Assembly[] configurationAssemblies)
36+
{
37+
var writeToDirective = _configuration.GetSection("WriteTo");
38+
if (writeToDirective != null)
39+
{
40+
var methodCalls = GetMethodCalls(writeToDirective);
41+
CallConfigurationMethods(methodCalls, FindSinkConfigurationMethods(configurationAssemblies),
42+
loggerConfiguration.WriteTo);
43+
}
44+
}
3145

46+
void ApplyEnrichment(LoggerConfiguration loggerConfiguration, Assembly[] configurationAssemblies)
47+
{
3248
var enrichDirective = _configuration.GetSection("Enrich");
3349
if (enrichDirective != null)
3450
{
@@ -45,16 +61,10 @@ public void Configure(LoggerConfiguration loggerConfiguration)
4561
if (withDirective != null)
4662
{
4763
var methodCalls = GetMethodCalls(withDirective);
48-
CallConfigurationMethods(methodCalls, FindEventEnricherConfigurationMethods(configurationAssemblies), loggerConfiguration.Enrich);
64+
CallConfigurationMethods(methodCalls, FindEventEnricherConfigurationMethods(configurationAssemblies),
65+
loggerConfiguration.Enrich);
4966
}
5067
}
51-
52-
var writeToDirective = _configuration.GetSection("WriteTo");
53-
if (writeToDirective != null)
54-
{
55-
var methodCalls = GetMethodCalls(writeToDirective);
56-
CallConfigurationMethods(methodCalls, FindSinkConfigurationMethods(configurationAssemblies), loggerConfiguration.WriteTo);
57-
}
5868
}
5969

6070
Dictionary<string, Dictionary<string, string>> GetMethodCalls(IConfigurationSection directive)

0 commit comments

Comments
 (0)