Merge pull request #406 from ucdavis/srk/stack-is-back

need to call ConfigureStackifyLogging
ucdavis · Jan 19, 2024 · f032efb · f032efb
2 parents c0b7f03 + 3f0de83
commit f032efb
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 3 deletions.
diff --git a/Sloth.Api/Logging/LoggingConfiguration.cs b/Sloth.Api/Logging/LoggingConfiguration.cs
@@ -7,6 +7,7 @@
 using Serilog.Exceptions;
 using Serilog.Sinks.Elasticsearch;
 using Serilog.Sinks.MSSqlServer;
+using StackifyLib;
 
 namespace Sloth.Api.Logging
 {
@@ -60,6 +61,11 @@ public static LoggerConfiguration GetConfiguration()
             // add in stackify sink if the api key is valid
             if (!string.IsNullOrEmpty(loggingSection.GetValue<string>("ApiKey")))
             {
+                if (!_loggingSetup)
+                {
+                    _configuration.ConfigureStackifyLogging(); // applies stackify settings
+                }
+
                 logConfig = logConfig.WriteTo.Stackify();
             }
 

diff --git a/Sloth.Api/Sloth.Api.csproj b/Sloth.Api/Sloth.Api.csproj
@@ -30,6 +30,7 @@
 		<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="8.4.1" />
     <PackageReference Include="Serilog.Sinks.MSSqlServer" Version="5.7.1" />
     <PackageReference Include="Serilog.Sinks.Stackify" Version="2.0.2" />
+    <PackageReference Include="StackifyLib" Version="2.2.13" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.1" />
   </ItemGroup>
 

diff --git a/Sloth.Jobs.Core/Logging/LoggingConfiguration.cs b/Sloth.Jobs.Core/Logging/LoggingConfiguration.cs
@@ -8,6 +8,7 @@
 using Serilog.Sinks.Elasticsearch;
 using Serilog.Sinks.MSSqlServer;
 using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Options;
+using StackifyLib;
 
 namespace Sloth.Jobs.Core.Logging
 {
@@ -66,6 +67,11 @@ public static LoggerConfiguration GetConfiguration()
             // add in stackify sink if the api key is valid
             if (!string.IsNullOrEmpty(loggingSection.GetValue<string>("ApiKey")))
             {
+                if (!_loggingSetup)
+                {
+                    _configuration.ConfigureStackifyLogging(); // applies stackify settings
+                }
+
                 logConfig = logConfig.WriteTo.Stackify();
             }
 

diff --git a/Sloth.Jobs.Core/Sloth.Jobs.Core.csproj b/Sloth.Jobs.Core/Sloth.Jobs.Core.csproj
@@ -19,6 +19,7 @@
 		<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="8.4.1" />
     <PackageReference Include="Serilog.Sinks.MSSqlServer" Version="5.7.1" />
     <PackageReference Include="Serilog.Sinks.Stackify" Version="2.0.2" />
+    <PackageReference Include="StackifyLib" Version="2.2.13" />
   </ItemGroup>
 
 </Project>
diff --git a/Sloth.Web/Logging/LoggingConfiguration.cs b/Sloth.Web/Logging/LoggingConfiguration.cs
@@ -1,14 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Diagnostics;
 using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
 using Serilog.Exceptions;
 using Serilog.Sinks.Elasticsearch;
 using Serilog.Sinks.MSSqlServer;
-using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Options;
+using StackifyLib;
 
 namespace Sloth.Web.Logging
 {
@@ -61,9 +60,14 @@ public static LoggerConfiguration GetConfiguration()
             // add in stackify sink if the api key is valid
             if (!string.IsNullOrEmpty(loggingSection.GetValue<string>("ApiKey")))
             {
+                if (!_loggingSetup)
+                {
+                    _configuration.ConfigureStackifyLogging(); // applies stackify settings
+                }
+
                 logConfig = logConfig.WriteTo.Stackify();
             }
-            
+
             // add in elastic search sink if the uri is valid
             if (Uri.TryCreate(loggingSection.GetValue<string>("ElasticUrl"), UriKind.Absolute, out var elasticUri))
             {

diff --git a/Sloth.Web/Sloth.Web.csproj b/Sloth.Web/Sloth.Web.csproj
@@ -38,6 +38,8 @@
     <PackageReference Include="Serilog.Sinks.Stackify" Version="2.0.2" />
 
     <PackageReference Include="SSH.NET" Version="2020.0.2" />
+
+    <PackageReference Include="StackifyLib" Version="2.2.13" />
   </ItemGroup>
 
   <ItemGroup>