From 13db0285c9c96352674edf7e869a7445ab4e99eb Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 23 Mar 2018 13:39:34 -0400
Subject: [PATCH] cleanup logs

---
 src/Admin/Startup.cs                          |  2 +-
 src/Core/Core.csproj                          |  2 +-
 src/Core/Utilities/LoggerFactoryExtensions.cs | 13 +++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Admin/Startup.cs b/src/Admin/Startup.cs
index 46552fbf15..fbb6496570 100644
--- a/src/Admin/Startup.cs
+++ b/src/Admin/Startup.cs
@@ -62,7 +62,7 @@ namespace Bit.Admin
             GlobalSettings globalSettings,
             ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddSerilog(env, appLifetime, globalSettings, (e) => e.Level >= LogEventLevel.Error);
+            loggerFactory.AddSerilog(app, env, appLifetime, globalSettings, (e) => e.Level >= LogEventLevel.Error);
 
             if(env.IsDevelopment())
             {
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
index 740d920d4c..72ee0be12f 100644
--- a/src/Core/Core.csproj
+++ b/src/Core/Core.csproj
@@ -69,10 +69,10 @@
     <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
     <PackageReference Include="Serilog.Extensions.Logging.File" Version="1.1.0" />
     <PackageReference Include="Serilog.Sinks.AzureDocumentDB" Version="3.8.0" />
+    <PackageReference Include="Serilog.Sinks.Sentry.AspNetCore" Version="2.1.4" />
     <PackageReference Include="IdentityServer4" Version="2.1.2" />
     <PackageReference Include="Dapper" Version="1.50.4" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
-    <PackageReference Include="Serilog.Sinks.Sentry.AspNetCore" Version="2.1.4" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="2.1.0" />
     <PackageReference Include="Braintree" Version="3.12.0" />
diff --git a/src/Core/Utilities/LoggerFactoryExtensions.cs b/src/Core/Utilities/LoggerFactoryExtensions.cs
index 7816ff88ca..205fa8b597 100644
--- a/src/Core/Utilities/LoggerFactoryExtensions.cs
+++ b/src/Core/Utilities/LoggerFactoryExtensions.cs
@@ -28,13 +28,13 @@ namespace Bit.Core.Utilities
                     .Enrich.FromLogContext()
                     .Filter.ByIncludingOnly(filter);
 
-                if(globalSettings.DocumentDb != null && CoreHelpers.SettingHasValue(globalSettings.DocumentDb.Uri) &&
-                    CoreHelpers.SettingHasValue(globalSettings.DocumentDb.Key))
+                if(CoreHelpers.SettingHasValue(globalSettings?.DocumentDb.Uri) &&
+                    CoreHelpers.SettingHasValue(globalSettings?.DocumentDb.Key))
                 {
-                    config.WriteTo.AzureDocumentDB(new Uri(globalSettings.DocumentDb.Uri), globalSettings.DocumentDb.Key,
-                        timeToLive: TimeSpan.FromDays(7));
+                    config.WriteTo.AzureDocumentDB(new Uri(globalSettings.DocumentDb.Uri),
+                        globalSettings.DocumentDb.Key, timeToLive: TimeSpan.FromDays(7));
                 }
-                else if(globalSettings.Sentry != null && CoreHelpers.SettingHasValue(globalSettings.Sentry.Dsn))
+                else if(CoreHelpers.SettingHasValue(globalSettings?.Sentry.Dsn))
                 {
                     config.WriteTo.Sentry(globalSettings.Sentry.Dsn)
                         .Enrich.FromLogContext()
@@ -46,7 +46,8 @@ namespace Bit.Core.Utilities
                 }
                 else if(CoreHelpers.SettingHasValue(globalSettings.LogDirectory))
                 {
-                    config.WriteTo.RollingFile($"{globalSettings.LogDirectory}/{globalSettings.ProjectName}/{{Date}}.txt");
+                    config.WriteTo.RollingFile(
+                        $"{globalSettings.LogDirectory}/{globalSettings.ProjectName}/{{Date}}.txt");
                 }
 
                 var serilog = config.CreateLogger();