Skip to content

Commit c608cc9

Browse files
committed
Sample targeting
1 parent fa07aaf commit c608cc9

File tree

4 files changed

+56
-73
lines changed

4 files changed

+56
-73
lines changed

sample/ConsoleDemo/ConsoleDemo.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

sample/ConsoleDemo/Program.cs

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,29 @@
33
using System;
44
using System.Threading;
55

6-
namespace ConsoleDemo;
6+
Log.Logger = new LoggerConfiguration()
7+
.MinimumLevel.Verbose()
8+
.WriteTo.Console(theme: AnsiConsoleTheme.Code)
9+
.CreateLogger();
710

8-
public static class Program
11+
try
912
{
10-
public static void Main()
11-
{
12-
Log.Logger = new LoggerConfiguration()
13-
.MinimumLevel.Verbose()
14-
.WriteTo.Console(theme: AnsiConsoleTheme.Code)
15-
.CreateLogger();
13+
Log.Debug("Getting started");
1614

17-
try
18-
{
19-
Log.Debug("Getting started");
15+
Log.Information("Hello {Name} from thread {ThreadId}", Environment.GetEnvironmentVariable("USERNAME"), Thread.CurrentThread.ManagedThreadId);
2016

21-
Log.Information("Hello {Name} from thread {ThreadId}", Environment.GetEnvironmentVariable("USERNAME"), Thread.CurrentThread.ManagedThreadId);
17+
Log.Warning("No coins remain at position {@Position}", new { Lat = 25, Long = 134 });
2218

23-
Log.Warning("No coins remain at position {@Position}", new { Lat = 25, Long = 134 });
24-
25-
Fail();
26-
}
27-
catch (Exception e)
28-
{
29-
Log.Error(e, "Something went wrong");
30-
}
19+
Fail();
20+
}
21+
catch (Exception e)
22+
{
23+
Log.Error(e, "Something went wrong");
24+
}
3125

32-
Log.CloseAndFlush();
33-
}
26+
await Log.CloseAndFlushAsync();
3427

35-
static void Fail()
36-
{
37-
throw new DivideByZeroException();
38-
}
39-
}
28+
static void Fail()
29+
{
30+
throw new DivideByZeroException();
31+
}

sample/SyncWritesDemo/Program.cs

Lines changed: 35 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,47 @@
11
using Serilog;
22
using Serilog.Sinks.SystemConsole.Themes;
33
using System;
4-
using System.Threading;
54
using System.Threading.Tasks;
65

7-
namespace SyncWritesDemo;
6+
Console.WriteLine("A sample of how to sync writes to the console sink.");
87

9-
public static class Program
8+
if (args is { Length: 1 })
109
{
11-
public static void Main(string[] args)
10+
switch (args[0])
1211
{
13-
Console.WriteLine("A sample of how to sync writes to the console sink.");
14-
15-
if (args != null && args.Length == 1)
16-
{
17-
switch (args[0])
18-
{
19-
case "--sync-root-default":
20-
SystemConsoleSyncTest(syncRootForLogger1: null, syncRootForLogger2: null);
21-
return;
22-
case "--sync-root-separate":
23-
SystemConsoleSyncTest(syncRootForLogger1: new object(), syncRootForLogger2: new object());
24-
return;
25-
case "--sync-root-same":
26-
var sameSyncRoot = new object();
27-
SystemConsoleSyncTest(syncRootForLogger1: sameSyncRoot, syncRootForLogger2: sameSyncRoot);
28-
return;
29-
}
30-
}
31-
32-
Console.WriteLine("Expecting one of the following arguments:{0}--sync-root-default{0}--sync-root-separate{0}--sync-root-same", Environment.NewLine);
12+
case "--sync-root-default":
13+
SystemConsoleSyncTest(syncRootForLogger1: null, syncRootForLogger2: null);
14+
return;
15+
case "--sync-root-separate":
16+
SystemConsoleSyncTest(syncRootForLogger1: new object(), syncRootForLogger2: new object());
17+
return;
18+
case "--sync-root-same":
19+
var sameSyncRoot = new object();
20+
SystemConsoleSyncTest(syncRootForLogger1: sameSyncRoot, syncRootForLogger2: sameSyncRoot);
21+
return;
3322
}
23+
}
3424

35-
static void SystemConsoleSyncTest(object syncRootForLogger1, object syncRootForLogger2)
36-
{
37-
var logger1 = new LoggerConfiguration()
38-
.MinimumLevel.Verbose()
39-
.Enrich.WithProperty("Logger", "logger1")
40-
.WriteTo.Console(theme: SystemConsoleTheme.Literate, syncRoot: syncRootForLogger1)
41-
.CreateLogger();
25+
Console.WriteLine("Expecting one of the following arguments:{0}--sync-root-default{0}--sync-root-separate{0}--sync-root-same", Environment.NewLine);
4226

43-
var logger2 = new LoggerConfiguration()
44-
.MinimumLevel.Verbose()
45-
.Enrich.WithProperty("Logger", "logger2")
46-
.WriteTo.Console(theme: SystemConsoleTheme.Literate, syncRoot: syncRootForLogger2)
47-
.CreateLogger();
27+
static void SystemConsoleSyncTest(object syncRootForLogger1, object syncRootForLogger2)
28+
{
29+
var logger1 = new LoggerConfiguration()
30+
.MinimumLevel.Verbose()
31+
.Enrich.WithProperty("Logger", "logger1")
32+
.WriteTo.Console(theme: SystemConsoleTheme.Literate, syncRoot: syncRootForLogger1)
33+
.CreateLogger();
4834

49-
var options = new ParallelOptions { MaxDegreeOfParallelism = 8 };
50-
Parallel.For(0, 1000, options, (i, loopState) =>
51-
{
52-
var logger = (i % 2 == 0) ? logger1 : logger2;
53-
logger.Information("Event {Iteration} generated by {ThreadId}", i, Thread.CurrentThread.ManagedThreadId);
54-
});
55-
}
56-
}
35+
var logger2 = new LoggerConfiguration()
36+
.MinimumLevel.Verbose()
37+
.Enrich.WithProperty("Logger", "logger2")
38+
.WriteTo.Console(theme: SystemConsoleTheme.Literate, syncRoot: syncRootForLogger2)
39+
.CreateLogger();
40+
41+
var options = new ParallelOptions { MaxDegreeOfParallelism = 8 };
42+
Parallel.For(0, 1000, options, (i, _) =>
43+
{
44+
var logger = i % 2 == 0 ? logger1 : logger2;
45+
logger.Information("Event {Iteration} generated by {ThreadId}", i, Environment.CurrentManagedThreadId);
46+
});
47+
}

sample/SyncWritesDemo/SyncWritesDemo.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

0 commit comments

Comments
 (0)