diff --git a/sample/ConsoleDemo/ConsoleDemo.csproj b/sample/ConsoleDemo/ConsoleDemo.csproj index de9024a..67ca599 100644 --- a/sample/ConsoleDemo/ConsoleDemo.csproj +++ b/sample/ConsoleDemo/ConsoleDemo.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 diff --git a/sample/ConsoleDemo/Program.cs b/sample/ConsoleDemo/Program.cs index 3ff0ec4..6264faa 100644 --- a/sample/ConsoleDemo/Program.cs +++ b/sample/ConsoleDemo/Program.cs @@ -3,37 +3,29 @@ using System; using System.Threading; -namespace ConsoleDemo; +Log.Logger = new LoggerConfiguration() + .MinimumLevel.Verbose() + .WriteTo.Console(theme: AnsiConsoleTheme.Code) + .CreateLogger(); -public static class Program +try { - public static void Main() - { - Log.Logger = new LoggerConfiguration() - .MinimumLevel.Verbose() - .WriteTo.Console(theme: AnsiConsoleTheme.Code) - .CreateLogger(); + Log.Debug("Getting started"); - try - { - Log.Debug("Getting started"); + Log.Information("Hello {Name} from thread {ThreadId}", Environment.GetEnvironmentVariable("USERNAME"), Thread.CurrentThread.ManagedThreadId); - Log.Information("Hello {Name} from thread {ThreadId}", Environment.GetEnvironmentVariable("USERNAME"), Thread.CurrentThread.ManagedThreadId); + Log.Warning("No coins remain at position {@Position}", new { Lat = 25, Long = 134 }); - Log.Warning("No coins remain at position {@Position}", new { Lat = 25, Long = 134 }); - - Fail(); - } - catch (Exception e) - { - Log.Error(e, "Something went wrong"); - } + Fail(); +} +catch (Exception e) +{ + Log.Error(e, "Something went wrong"); +} - Log.CloseAndFlush(); - } +await Log.CloseAndFlushAsync(); - static void Fail() - { - throw new DivideByZeroException(); - } -} \ No newline at end of file +static void Fail() +{ + throw new DivideByZeroException(); +} diff --git a/sample/SyncWritesDemo/Program.cs b/sample/SyncWritesDemo/Program.cs index 3220c12..f1015a1 100644 --- a/sample/SyncWritesDemo/Program.cs +++ b/sample/SyncWritesDemo/Program.cs @@ -1,56 +1,47 @@ using Serilog; using Serilog.Sinks.SystemConsole.Themes; using System; -using System.Threading; using System.Threading.Tasks; -namespace SyncWritesDemo; +Console.WriteLine("A sample of how to sync writes to the console sink."); -public static class Program +if (args is { Length: 1 }) { - public static void Main(string[] args) + switch (args[0]) { - Console.WriteLine("A sample of how to sync writes to the console sink."); - - if (args != null && args.Length == 1) - { - switch (args[0]) - { - case "--sync-root-default": - SystemConsoleSyncTest(syncRootForLogger1: null, syncRootForLogger2: null); - return; - case "--sync-root-separate": - SystemConsoleSyncTest(syncRootForLogger1: new object(), syncRootForLogger2: new object()); - return; - case "--sync-root-same": - var sameSyncRoot = new object(); - SystemConsoleSyncTest(syncRootForLogger1: sameSyncRoot, syncRootForLogger2: sameSyncRoot); - return; - } - } - - Console.WriteLine("Expecting one of the following arguments:{0}--sync-root-default{0}--sync-root-separate{0}--sync-root-same", Environment.NewLine); + case "--sync-root-default": + SystemConsoleSyncTest(syncRootForLogger1: null, syncRootForLogger2: null); + return; + case "--sync-root-separate": + SystemConsoleSyncTest(syncRootForLogger1: new object(), syncRootForLogger2: new object()); + return; + case "--sync-root-same": + var sameSyncRoot = new object(); + SystemConsoleSyncTest(syncRootForLogger1: sameSyncRoot, syncRootForLogger2: sameSyncRoot); + return; } +} - static void SystemConsoleSyncTest(object syncRootForLogger1, object syncRootForLogger2) - { - var logger1 = new LoggerConfiguration() - .MinimumLevel.Verbose() - .Enrich.WithProperty("Logger", "logger1") - .WriteTo.Console(theme: SystemConsoleTheme.Literate, syncRoot: syncRootForLogger1) - .CreateLogger(); +Console.WriteLine("Expecting one of the following arguments:{0}--sync-root-default{0}--sync-root-separate{0}--sync-root-same", Environment.NewLine); - var logger2 = new LoggerConfiguration() - .MinimumLevel.Verbose() - .Enrich.WithProperty("Logger", "logger2") - .WriteTo.Console(theme: SystemConsoleTheme.Literate, syncRoot: syncRootForLogger2) - .CreateLogger(); +static void SystemConsoleSyncTest(object syncRootForLogger1, object syncRootForLogger2) +{ + var logger1 = new LoggerConfiguration() + .MinimumLevel.Verbose() + .Enrich.WithProperty("Logger", "logger1") + .WriteTo.Console(theme: SystemConsoleTheme.Literate, syncRoot: syncRootForLogger1) + .CreateLogger(); - var options = new ParallelOptions { MaxDegreeOfParallelism = 8 }; - Parallel.For(0, 1000, options, (i, loopState) => - { - var logger = (i % 2 == 0) ? logger1 : logger2; - logger.Information("Event {Iteration} generated by {ThreadId}", i, Thread.CurrentThread.ManagedThreadId); - }); - } -} \ No newline at end of file + var logger2 = new LoggerConfiguration() + .MinimumLevel.Verbose() + .Enrich.WithProperty("Logger", "logger2") + .WriteTo.Console(theme: SystemConsoleTheme.Literate, syncRoot: syncRootForLogger2) + .CreateLogger(); + + var options = new ParallelOptions { MaxDegreeOfParallelism = 8 }; + Parallel.For(0, 1000, options, (i, _) => + { + var logger = i % 2 == 0 ? logger1 : logger2; + logger.Information("Event {Iteration} generated by {ThreadId}", i, Environment.CurrentManagedThreadId); + }); +} diff --git a/sample/SyncWritesDemo/SyncWritesDemo.csproj b/sample/SyncWritesDemo/SyncWritesDemo.csproj index de9024a..67ca599 100644 --- a/sample/SyncWritesDemo/SyncWritesDemo.csproj +++ b/sample/SyncWritesDemo/SyncWritesDemo.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0