From bb69415354e327af72c32f9a8f8eeeb5a0fb1832 Mon Sep 17 00:00:00 2001
From: Denis Prokhorchik <live-dev@hotmail.com>
Date: Sun, 9 Jan 2022 12:32:08 +0300
Subject: [PATCH] feat(issue-121): update .net core 2.1 to 2.2 & add serilog
 libs

---
 .../O2NextGen.ESender.Api.csproj              | 14 ++++++-
 .../e-sender/O2NextGen.ESender.Api/Program.cs | 41 +++++++++++++++++--
 .../O2NextGen.ESender.Api/appsettings.json    |  5 ++-
 3 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/O2NextGen.ESender.Api.csproj b/src/Services/e-sender/O2NextGen.ESender.Api/O2NextGen.ESender.Api.csproj
index 047a8a83..ee2d7237 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/O2NextGen.ESender.Api.csproj
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/O2NextGen.ESender.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,7 +13,17 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.2" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
+    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1">
+    </PackageReference>
+    <PackageReference Include="Serilog.Settings.Configuration" Version="2.2.0">
+    </PackageReference>
+    <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0">
+    </PackageReference>
+    <PackageReference Include="Serilog.Sinks.Console" Version="2.1.0">
+    </PackageReference>
+    <PackageReference Include="Serilog.Sinks.File" Version="2.2.0">
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Program.cs b/src/Services/e-sender/O2NextGen.ESender.Api/Program.cs
index 0402e0fe..e32e2c25 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Program.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Program.cs
@@ -1,17 +1,52 @@
-using Microsoft.AspNetCore;
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
+using Serilog;
 
 namespace O2NextGen.ESender.Api
 {
     public class Program
     {
-        public static void Main(string[] args)
+        public static readonly string Namespace = typeof(Program).Namespace;
+
+        public static readonly string AppName =
+            Namespace.Substring(Namespace.LastIndexOf('.', Namespace.LastIndexOf('.') - 1) + 1);
+        
+        public static async Task<int> Main(string[] args)
         {
-            CreateWebHostBuilder(args).Build().Run();
+            try
+            {
+                Log.Logger = new LoggerConfiguration()
+                    .Enrich.FromLogContext()
+#if DEBUG
+                    .WriteTo.File("Logs/system_logs.txt")
+#endif
+                    .WriteTo.Console()
+                    
+                    .CreateLogger();
+                
+                var host = CreateWebHostBuilder(args).Build();
+                Log.Information($"############### {AppName} ##############");
+                Log.Information("################# Starting Application #################");
+                await host.RunAsync();
+                Log.Information($"============== {AppName} - state is started =====================");
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                Log.Fatal(ex, "Host terminated unexpectedly");
+                return 1;
+            }
+            finally
+            {
+                Log.CloseAndFlush();
+            }
         }
 
         public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
+                .UseSerilog()
                 .UseStartup<Startup>();
     }
 }
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/appsettings.json b/src/Services/e-sender/O2NextGen.ESender.Api/appsettings.json
index 26ead046..76e2ab2a 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/appsettings.json
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/appsettings.json
@@ -1,7 +1,10 @@
 {
   "Logging": {
+    "IncludeScopes": false,
     "LogLevel": {
-      "Default": "Warning"
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
     }
   },
   "AllowedHosts": "*",