From 46c3b812e8ebd80298502e73b4bc982f61241db2 Mon Sep 17 00:00:00 2001 From: helto4real Date: Sat, 11 Apr 2020 09:13:11 +0200 Subject: [PATCH 1/3] Fix possible missed logs --- README.md | 2 +- src/Service/Program.cs | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ad2463f65..e8d4434e2 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ The following environment variables are available to identify your Home Assistan Example giving: ``` -docker run -d \ +docker run -dt \ --name netdaemon \ --restart=always \ -e HASS_HOST=192.168.1.1 \ diff --git a/src/Service/Program.cs b/src/Service/Program.cs index 06467ea7d..e18f68078 100644 --- a/src/Service/Program.cs +++ b/src/Service/Program.cs @@ -67,14 +67,17 @@ public static async Task Main(string[] args) .MinimumLevel.Is(Program.LogLevel) .WriteTo.Console(theme: AnsiConsoleTheme.Code) .CreateLogger(); + + CreateHostBuilder(args).Build().Run(); } catch (Exception e) { Log.Fatal(e, "Home assistant add-on config not valid json, ending add-on..."); - return; } - - CreateHostBuilder(args).Build().Run(); + finally + { + Log.CloseAndFlush(); + } } public static IHostBuilder CreateHostBuilder(string[] args) => From e17370566cbed7356c5d8137d20936645b933800 Mon Sep 17 00:00:00 2001 From: helto4real Date: Sat, 11 Apr 2020 09:18:53 +0200 Subject: [PATCH 2/3] Use the "UseSerilog" instead --- src/Service/Program.cs | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Service/Program.cs b/src/Service/Program.cs index e18f68078..a44134e99 100644 --- a/src/Service/Program.cs +++ b/src/Service/Program.cs @@ -82,14 +82,16 @@ public static async Task Main(string[] args) public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) - .ConfigureServices(services => { services.AddHostedService(); }) - .ConfigureLogging(logging => - { - logging.ClearProviders(); - // logging.AddConsole(options => options.IncludeScopes = false); - // logging.AddDebug(); - // logging.AddFilter("Microsoft", LogLevel.Error); - logging.AddSerilog(); - }); + .UseSerilog() + .ConfigureServices(services => { services.AddHostedService(); }); + // .ConfigureLogging(logging => + // { + // logging.ClearProviders(); + // // logging.AddConsole(options => options.IncludeScopes = false); + // // logging.AddDebug(); + // // logging.AddFilter("Microsoft", LogLevel.Error); + // logging.AddSerilog(); + // } + // ); } } \ No newline at end of file From c26785b7abb893638e2c33a27c241db9ed6ed410 Mon Sep 17 00:00:00 2001 From: helto4real Date: Sat, 11 Apr 2020 09:24:47 +0200 Subject: [PATCH 3/3] Version bump client --- src/App/NetDaemon.App/NetDaemon.App.csproj | 2 +- src/Daemon/NetDaemon.Daemon/NetDaemon.Daemon.csproj | 2 +- src/DaemonRunner/DaemonRunner/DaemonRunner.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/App/NetDaemon.App/NetDaemon.App.csproj b/src/App/NetDaemon.App/NetDaemon.App.csproj index 88f4adb49..9db5e4e9e 100644 --- a/src/App/NetDaemon.App/NetDaemon.App.csproj +++ b/src/App/NetDaemon.App/NetDaemon.App.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/Daemon/NetDaemon.Daemon/NetDaemon.Daemon.csproj b/src/Daemon/NetDaemon.Daemon/NetDaemon.Daemon.csproj index 370aaa646..d40d5c411 100644 --- a/src/Daemon/NetDaemon.Daemon/NetDaemon.Daemon.csproj +++ b/src/Daemon/NetDaemon.Daemon/NetDaemon.Daemon.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/DaemonRunner/DaemonRunner/DaemonRunner.csproj b/src/DaemonRunner/DaemonRunner/DaemonRunner.csproj index f75fa5af3..e759cb7f9 100644 --- a/src/DaemonRunner/DaemonRunner/DaemonRunner.csproj +++ b/src/DaemonRunner/DaemonRunner/DaemonRunner.csproj @@ -21,7 +21,7 @@ - +