Merge pull request #62 from SkillsFundingAgency/CON-2001-nLog-fix

Added dev / deployed nLog config
SkillsFundingAgency · Jul 8, 2020 · d43a259 · d43a259
2 parents 2734a98 + be22e53
commit d43a259
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 6 deletions.
diff --git a/src/SFA.DAS.Notifications.Api/Program.cs b/src/SFA.DAS.Notifications.Api/Program.cs
@@ -13,7 +13,9 @@ public class Program
     {
         public static void Main(string[] args)
         {
-            var logger = NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();
+            var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
+            var logger = NLogBuilder.ConfigureNLog(environment == "Development" ? "nlog.Development.config" : "nlog.config").GetCurrentClassLogger();
+
             try
             {
                 logger.Info("Starting up host");

diff --git a/src/SFA.DAS.Notifications.Api/nlog.Development.config b/src/SFA.DAS.Notifications.Api/nlog.Development.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <extensions>
+    <add assembly="SFA.DAS.NLog.Targets.Redis" />
+  </extensions>
+  <variable name="appName" value="das-notifications-api" />
+  <variable name="simplelayout" value="${longdate} [${uppercase:${level}}] [${logger}] - ${message} ${onexception:${exception:format=tostring}}" />
+  <targets>
+    <target name="Console" layout="${simplelayout}" xsi:type="Console" />
+    <target name="File" fileName="${basedir}/logs/${appName}.${shortdate}.log" layout="${simplelayout}" xsi:type="File" />
+  </targets>
+  <rules>
+    <logger name="*" minlevel="Info" writeTo="File" />
+  </rules>
+</nlog>
diff --git a/src/SFA.DAS.Notifications.Api/nlog.config b/src/SFA.DAS.Notifications.Api/nlog.config
@@ -7,10 +7,9 @@
   <variable name="simplelayout" value="${longdate} [${uppercase:${level}}] [${logger}] - ${message} ${onexception:${exception:format=tostring}}" />
   <targets>
     <target name="Console" layout="${simplelayout}" xsi:type="Console" />
-    <target name="File" fileName="${basedir}/logs/${appName}.${shortdate}.log" layout="${simplelayout}" xsi:type="File" />
     <target name="Redis" appName="${appName}" environmentKeyName="EnvironmentName" connectionStringName="LoggingRedisConnectionString" includeAllProperties="true" layout="${message}" xsi:type="Redis" />
   </targets>
   <rules>
-    <logger name="*" minlevel="Info" writeTo="File, Redis" />
+    <logger name="*" minlevel="Info" writeTo="Redis" />
   </rules>
 </nlog>
diff --git a/src/SFA.DAS.Notifications.MessageHandlers/Program.cs b/src/SFA.DAS.Notifications.MessageHandlers/Program.cs
@@ -24,7 +24,7 @@ static async Task Main(string[] args)
                     .ConfigureDasAppConfiguration(args)
                     .ConfigureLogging((context, b) =>
                     {
-                        b.AddNLog();
+                        b.AddNLog(context.HostingEnvironment.IsDevelopment() ? "nlog.development.config" : "nlog.config");
                         b.AddApplicationInsightsWebJobs(o => o.InstrumentationKey = context.Configuration["APPINSIGHTS_INSTRUMENTATIONKEY"]);
                     })
                     .UseConsoleLifetime()

diff --git a/src/SFA.DAS.Notifications.MessageHandlers/SFA.DAS.Notifications.MessageHandlers.csproj b/src/SFA.DAS.Notifications.MessageHandlers/SFA.DAS.Notifications.MessageHandlers.csproj
@@ -53,6 +53,9 @@
     <None Update="appsettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="nlog.Development.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="nlog.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

diff --git a/src/SFA.DAS.Notifications.MessageHandlers/nlog.Development.config b/src/SFA.DAS.Notifications.MessageHandlers/nlog.Development.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <extensions>
+    <add assembly="SFA.DAS.NLog.Targets.Redis" />
+  </extensions>
+  <variable name="appName" value="das-notifications-worker"/>
+  <variable name="simplelayout" value="${longdate} [${uppercase:${level}}] [${logger}] - ${message} ${onexception:${exception:format=tostring}}" />
+  <targets>
+    <target name="Console" layout="${simplelayout}" xsi:type="Console" />
+    <target name="File" fileName="${basedir}/logs/${appName}.${shortdate}.log" layout="${simplelayout}" xsi:type="File" />
+  </targets>
+  <rules>
+    <logger name="*" minlevel="Debug" writeTo="Console, File" />
+  </rules>
+</nlog>
diff --git a/src/SFA.DAS.Notifications.MessageHandlers/nlog.config b/src/SFA.DAS.Notifications.MessageHandlers/nlog.config
@@ -7,10 +7,9 @@
   <variable name="simplelayout" value="${longdate} [${uppercase:${level}}] [${logger}] - ${message} ${onexception:${exception:format=tostring}}" />
   <targets>
     <target name="Console" layout="${simplelayout}" xsi:type="Console" />
-    <target name="File" fileName="${basedir}/logs/${appName}.${shortdate}.log" layout="${simplelayout}" xsi:type="File" />
     <target name="Redis" appName="${appName}" environmentKeyName="EnvironmentName" connectionStringName="APPSETTING_LoggingRedisConnectionString" includeAllProperties="true" layout="${message}" xsi:type="Redis" />
   </targets>
   <rules>
-    <logger name="*" minlevel="Debug" writeTo="Console, File, Redis" />
+    <logger name="*" minlevel="Debug" writeTo="Console, Redis" />
   </rules>
 </nlog>