Merge c26785b into 8fee408

net-daemon · Apr 11, 2020 · b8f0553 · b8f0553
2 parents 8fee408 + c26785b
commit b8f0553
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 16 deletions.
diff --git 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/App/NetDaemon.App/NetDaemon.App.csproj b/src/App/NetDaemon.App/NetDaemon.App.csproj
@@ -23,7 +23,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JoySoftware.HassClient" Version="0.0.31-alpha" />
+    <PackageReference Include="JoySoftware.HassClient" Version="0.1.0-alpha" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.1" />
   </ItemGroup>
 

diff --git a/src/Daemon/NetDaemon.Daemon/NetDaemon.Daemon.csproj b/src/Daemon/NetDaemon.Daemon/NetDaemon.Daemon.csproj
@@ -20,7 +20,7 @@
 
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="JoySoftware.HassClient" Version="0.0.31-alpha" />
+    <PackageReference Include="JoySoftware.HassClient" Version="0.1.0-alpha" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.3" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/DaemonRunner/DaemonRunner/DaemonRunner.csproj b/src/DaemonRunner/DaemonRunner/DaemonRunner.csproj
@@ -21,7 +21,7 @@
 
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="JoySoftware.HassClient" Version="0.0.31-alpha" />
+    <PackageReference Include="JoySoftware.HassClient" Version="0.1.0-alpha" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.5.0" />
     <!-- <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.5.0-beta2-final" /> -->
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.3" />

diff --git a/src/Service/Program.cs b/src/Service/Program.cs
@@ -67,26 +67,31 @@ 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) =>
             Host.CreateDefaultBuilder(args)
-                .ConfigureServices(services => { services.AddHostedService<RunnerService>(); })
-                .ConfigureLogging(logging =>
-                {
-                    logging.ClearProviders();
-                    // logging.AddConsole(options => options.IncludeScopes = false);
-                    // logging.AddDebug();
-                    // logging.AddFilter("Microsoft", LogLevel.Error);
-                    logging.AddSerilog();
-                });
+                .UseSerilog()
+                .ConfigureServices(services => { services.AddHostedService<RunnerService>(); });
+        // .ConfigureLogging(logging =>
+        // {
+        //     logging.ClearProviders();
+        //     // logging.AddConsole(options => options.IncludeScopes = false);
+        //     // logging.AddDebug();
+        //     // logging.AddFilter("Microsoft", LogLevel.Error);
+        //     logging.AddSerilog();
+        // }
+        // );
     }
 }