Logging purge for TextFile implemented.

markhotchkiss · Dec 13, 2016 · bf85f39 · bf85f39
1 parent 69309f2
commit bf85f39
Show file tree

Hide file tree

Showing 19 changed files with 38 additions and 9 deletions.
diff --git a/.vs/ErrorLogger/v14/.suo b/.vs/ErrorLogger/v14/.suo
diff --git a/MJH.Logger/BusinessLogic/TextLogger/Archive.cs b/MJH.Logger/BusinessLogic/TextLogger/Archive.cs
@@ -8,7 +8,7 @@
 
 namespace MJH.BusinessLogic.TextLogger
 {
-    public class Archive : IArchive
+    public class Archive : IArchive, ILoggingPurge
     {
         public void ArchiveLogFile()
         {
@@ -96,5 +96,32 @@ private static int GetMaxLogFile(DirectoryInfo diInfo)
 
             return numberList.Max() + 1;
         }
+
+        public void Purge()
+        {
+            var config = GetConfig();
+
+            var directoryInfo = new DirectoryInfo(config.Text.FileInformation.ArchiveDirectory);
+
+            var listToRemove = new List<string>();
+
+            var fileCount = 0;
+
+            foreach (var file in directoryInfo.EnumerateFiles().OrderBy(d => d.LastWriteTime))
+            {
+                if (fileCount <= config.Text.LoggerInformation.FileHistoryToKeep)
+                {
+                    fileCount++;
+                    continue;
+                }
+
+                listToRemove.Add(file.FullName);
+            }
+
+            foreach (var file in listToRemove)
+            {
+                File.Delete(file);
+            }
+        }
     }
 }
diff --git a/MJH.Logger/LoggerConfig.xml b/MJH.Logger/LoggerConfig.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <LoggerConfig>
-  <LoggerType>SQL</LoggerType> <!--TextFile, SQLite, SQL-->
+  <LoggerType>TextFile</LoggerType> <!--TextFile, SQLite, SQL-->
   <LoggingLevel>Debug</LoggingLevel> <!--Debug, Info, Error - NOTE, this is case sensitive-->
   <Sql>
     <ServerInformation>
@@ -29,7 +29,7 @@
       <ArchiveDirectory>D:\Tests\Logger\Archive</ArchiveDirectory>
     </FileInformation>
     <LoggerInformation>
-      <FileHistoryToKeep>5</FileHistoryToKeep>
+      <FileHistoryToKeep>2</FileHistoryToKeep>
       <MaxFileSize>1</MaxFileSize>
     </LoggerInformation>
   </Text>

diff --git a/MJH.Logger/Loggers/TextLogger.cs b/MJH.Logger/Loggers/TextLogger.cs
@@ -109,6 +109,8 @@ private static void CheckArchive()
             }
 
             archive.ArchiveLogFile();
+
+            archive.Purge();
         }
     }
 }
diff --git a/MJH.Logger/bin/Debug/$RANDOM_SEED$ b/MJH.Logger/bin/Debug/$RANDOM_SEED$
@@ -1 +1 @@
-685101356
+175995522
diff --git a/MJH.Logger/bin/Debug/LoggerConfig.xml b/MJH.Logger/bin/Debug/LoggerConfig.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <LoggerConfig>
-  <LoggerType>SQL</LoggerType> <!--TextFile, SQLite, SQL-->
+  <LoggerType>TextFile</LoggerType> <!--TextFile, SQLite, SQL-->
   <LoggingLevel>Debug</LoggingLevel> <!--Debug, Info, Error - NOTE, this is case sensitive-->
   <Sql>
     <ServerInformation>
@@ -29,7 +29,7 @@
       <ArchiveDirectory>D:\Tests\Logger\Archive</ArchiveDirectory>
     </FileInformation>
     <LoggerInformation>
-      <FileHistoryToKeep>5</FileHistoryToKeep>
+      <FileHistoryToKeep>2</FileHistoryToKeep>
       <MaxFileSize>1</MaxFileSize>
     </LoggerInformation>
   </Text>

diff --git a/MJH.Logger/bin/Debug/MJH.Logger.dll b/MJH.Logger/bin/Debug/MJH.Logger.dll
diff --git a/MJH.Logger/bin/Debug/MJH.Logger.pdb b/MJH.Logger/bin/Debug/MJH.Logger.pdb
diff --git a/MJH.Logger/obj/Debug/MJH.Logger.dll b/MJH.Logger/obj/Debug/MJH.Logger.dll
diff --git a/MJH.Logger/obj/Debug/MJH.Logger.pdb b/MJH.Logger/obj/Debug/MJH.Logger.pdb
diff --git a/MJH.UnitTests/bin/Debug/$RANDOM_SEED$ b/MJH.UnitTests/bin/Debug/$RANDOM_SEED$
@@ -1 +1 @@
-685101356
+175995522
diff --git a/MJH.UnitTests/bin/Debug/LoggerConfig.xml b/MJH.UnitTests/bin/Debug/LoggerConfig.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <LoggerConfig>
-  <LoggerType>SQL</LoggerType> <!--TextFile, SQLite, SQL-->
+  <LoggerType>TextFile</LoggerType> <!--TextFile, SQLite, SQL-->
   <LoggingLevel>Debug</LoggingLevel> <!--Debug, Info, Error - NOTE, this is case sensitive-->
   <Sql>
     <ServerInformation>
@@ -29,7 +29,7 @@
       <ArchiveDirectory>D:\Tests\Logger\Archive</ArchiveDirectory>
     </FileInformation>
     <LoggerInformation>
-      <FileHistoryToKeep>5</FileHistoryToKeep>
+      <FileHistoryToKeep>2</FileHistoryToKeep>
       <MaxFileSize>1</MaxFileSize>
     </LoggerInformation>
   </Text>

diff --git a/MJH.UnitTests/bin/Debug/MJH.Logger.dll b/MJH.UnitTests/bin/Debug/MJH.Logger.dll
diff --git a/MJH.UnitTests/bin/Debug/MJH.Logger.pdb b/MJH.UnitTests/bin/Debug/MJH.Logger.pdb
diff --git a/MJH.UnitTests/bin/Debug/MJH.UnitTests.dll b/MJH.UnitTests/bin/Debug/MJH.UnitTests.dll
diff --git a/MJH.UnitTests/bin/Debug/MJH.UnitTests.pdb b/MJH.UnitTests/bin/Debug/MJH.UnitTests.pdb
diff --git a/MJH.UnitTests/obj/Debug/MJH.UnitTests.csprojResolveAssemblyReference.cache b/MJH.UnitTests/obj/Debug/MJH.UnitTests.csprojResolveAssemblyReference.cache
diff --git a/MJH.UnitTests/obj/Debug/MJH.UnitTests.dll b/MJH.UnitTests/obj/Debug/MJH.UnitTests.dll
diff --git a/MJH.UnitTests/obj/Debug/MJH.UnitTests.pdb b/MJH.UnitTests/obj/Debug/MJH.UnitTests.pdb
-Original file line number
+Diff line change
@@ Expand Up / @@ -109,6 +109,8 @@ private static void CheckArchive() @@
                 }
                 archive.ArchiveLogFile();
+                archive.Purge();
             }
         }
     }