solved bug on log journaling

arduosoft · Apr 3, 2017 · a4ca721 · a4ca721
1 parent 9ab25a9
commit a4ca721
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git a/Wlog.Library/BLL/Reporitories/DeletedLogRepository.cs b/Wlog.Library/BLL/Reporitories/DeletedLogRepository.cs
@@ -131,12 +131,17 @@ public bool ExecuteEmptyBinJob(int daysToKeep, int rowsToKeep)
                     }
 
 
-                    while (uow.Query<DeletedLogEntity>().Count() > rowsToKeep)
+                    int remaining = 0;
+
+                    while ((remaining = uow.Query<DeletedLogEntity>().Count() - rowsToKeep) > 0)
                     {
+                        var tmpBatchSize = Math.Min(remaining, batchSize);
+
+
                         //After I May need to remove addictional data to keep no more than x rows
                         var logsForBin = uow.Query<DeletedLogEntity>()
                             .OrderBy(x => x.SourceDate)
-                            .Take(batchSize).ToList();
+                            .Take(tmpBatchSize).ToList();
 
 
                         if (logsForBin.Any())

diff --git a/Wlog.Library/BLL/Reporitories/IndexRepository.cs b/Wlog.Library/BLL/Reporitories/IndexRepository.cs
@@ -16,6 +16,7 @@ namespace Wlog.Library.BLL.Reporitories
     /// </summary>
     public class IndexRepository: IRepository
     {
+        string indexLock = "";
         public Type GetEntityType()
         {
             return typeof(LuceneIndexManager);
@@ -78,8 +79,13 @@ private void CreateIndex(string name)
             var path = Path.Combine(BasePath, name);
             var idx = new LuceneIndexManager(name, path);
             idx.CommitSize = int.MaxValue; //commit is owned by the caller.
-
-            indexList.Add(name,idx );
+           lock(indexLock)
+            {
+                if (!indexList.ContainsKey(name))
+                {
+                    indexList.Add(name, idx);
+                }
+            }
         }
 
         /// <summary>

diff --git a/Wlog.Library/BLL/Reporitories/LogRepository.cs b/Wlog.Library/BLL/Reporitories/LogRepository.cs
@@ -407,13 +407,16 @@ public bool ExecuteMoveToBinJob(int daysToKeep, int rowsToKeep)
                         //Repeat until all logs before date are deleted
                     }
 
+                    int remaining = 0;
 
-                    while (uow.Query<LogEntity>().Count()> rowsToKeep)
+                    while ( (remaining=uow.Query<LogEntity>().Count()- rowsToKeep) >0)
                     {
+                         var tmpBatchSize = Math.Min(remaining, batchSize);
+
                         //After I May need to remove addictional data to keep no more than x rows
                         var logsForBin = uow.Query<LogEntity>()
                             .OrderBy(x => x.SourceDate)
-                            .Take(batchSize).ToList();                    
+                            .Take(tmpBatchSize).ToList();                    
 
 
                         if (logsForBin.Any())

diff --git a/Wlog.Library/Scheduler/Jobs/EmptyBinJob.cs b/Wlog.Library/Scheduler/Jobs/EmptyBinJob.cs
@@ -1,6 +1,7 @@
 using NLog;
 using System;
 using Wlog.Library.BLL.Reporitories;
+using Hangfire;
 
 namespace Wlog.Library.Scheduler.Jobs
 {
@@ -27,6 +28,7 @@ public EmptyBinJob()
             _daysToKeep = Settings.Default.EmptyBinJob_DaysToKeep;
         }
 
+        [DisableConcurrentExecution(3600)]
         public override bool Execute()
         {
             try

diff --git a/Wlog.Library/Scheduler/Jobs/MoveToBinJob.cs b/Wlog.Library/Scheduler/Jobs/MoveToBinJob.cs
@@ -1,6 +1,7 @@
 using NLog;
 using System;
 using Wlog.Library.BLL.Reporitories;
+using Hangfire;
 
 namespace Wlog.Library.Scheduler.Jobs
 {
@@ -27,6 +28,7 @@ public MoveToBinJob(int rowsToKeep, int daysToKeep)
             _daysToKeep = daysToKeep;
         }
 
+        [DisableConcurrentExecution(7200)]
         public override bool Execute()
         {
             try