v1.31.7.0

Schwirg László
1 parent 066d6e6f
Showing 2 changed files with 26 additions and 22 deletions Show diff stats
Vrh.Log4Pro.MaintenanceConsole/Manager - SQLDataBaseManager.cs
Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
@@ -2052,36 +2052,40 @@ GO
                     if (limitdatefornextrun >= par_limitdate) break;
                     limitdatefornextrun = limitdatefornextrun + par_lengthofonerun;
                     var loople = new List<KeyValuePair<string, string>>();
+					var loopstart = DateTime.Now;
                     if (limitdatefornextrun > par_limitdate) limitdatefornextrun = par_limitdate;
                     Add(loople, $"RUN#{deleteruncounter}");
-                    try
-                    {
-                        sqltxt = Tools.KvpString.Substitute($"{RUNNINGMODE}={RUNNINGMODE_ONERUN};{RUNNINGMODE_ONERUN_PARAMETER_DELETEBEFOREDATE}={limitdatefornextrun:s};", sqltxtalmostresolved);
-                        if (sqltxt == null) { return Finalize(1, Add(multirunresult, ERRMSG_NOTHINGTOEXECUTE)); } //won't really get, but we never know...
-                        ret1 = ExecuteSQLScript(sqlc, sqltxt, sqlscript.CommandTimeout, null);
-                        Add(loople, $"LIMITDATE", limitdatefornextrun.ToString());
-                        Add(loople, $"RETCODE", ret1.ReturnValue.ToString());
-                        Add(loople, $"RETMSG", ret1.ReturnMessage);
+					try
+					{
+						sqltxt = Tools.KvpString.Substitute($"{RUNNINGMODE}={RUNNINGMODE_ONERUN};{RUNNINGMODE_ONERUN_PARAMETER_DELETEBEFOREDATE}={limitdatefornextrun:s};", sqltxtalmostresolved);
+						if (sqltxt == null) { return Finalize(1, Add(multirunresult, ERRMSG_NOTHINGTOEXECUTE)); } //won't really get, but we never know...
+						ret1 = ExecuteSQLScript(sqlc, sqltxt, sqlscript.CommandTimeout, null);
+						Add(loople, $"LIMITDATE", limitdatefornextrun.ToString());
+						Add(loople, $"RETCODE", ret1.ReturnValue.ToString());
+						Add(loople, $"RETMSG", ret1.ReturnMessage);
+                        Add(loople, $"PROCESSINGTIME", DateTime.Now.Subtract(loopstart).ToString());
                         deleteruncounter++;
-                        exceptioncounter = 0;
-                        runresult = 0;
-                    }
-                    catch (Exception ex)
-                    {
-                        exceptioncounter++;
-                        string errmsg = ""; while (ex != null) { errmsg += ex.Message; ex = ex.InnerException; }
-                        Add(loople, $"EXCEPTION RESULT DeleteRun", errmsg);
+						exceptioncounter = 0;
+						runresult = 0;
+					}
+					catch (Exception ex)
+					{
+						exceptioncounter++;
+						string errmsg = ""; while (ex != null) { errmsg += ex.Message; ex = ex.InnerException; }
+						Add(loople, $"EXCEPTION RESULT DeleteRun", errmsg);
+                        Add(loople, $"PROCESSINGTIME", DateTime.Now.Subtract(loopstart).ToString());
                         runresult = 1;
-                        if (exceptioncounter > MAXEXCEPTIONS) { return Finalize(1, multirunresult); }
-                    }
+						if (exceptioncounter > MAXEXCEPTIONS) { return Finalize(1, multirunresult); }
+					}
+					
+                    
 					var waitforexitloopTS = par_delaybetweenruns.Ticks > new TimeSpan(0, 0, 5).Ticks ? par_delaybetweenruns : new TimeSpan(0, 0, 5);
                     var exitfromloop = (ExitAtThisPoint?.Invoke(Finalize(runresult, loople), waitforexitloopTS)) ?? false;
                     if (exitfromloop) { Add(multirunresult, $"Exit requested by user"); break; }
 					var remainingMSforsleep = par_delaybetweenruns.Add(waitforexitloopTS.Negate()).TotalMilliseconds;
                     if (remainingMSforsleep > 0) {	Thread.Sleep((int)(remainingMSforsleep)); }
                 }
-
                 //get minimum date in the database
                 getdbmindateresult = GetDBMindate(sqltxtalmostresolved, multirunresult, sqlscript.CommandTimeout, sqlc);
                 if (getdbmindateresult == null) return Finalize(1, multirunresult);
@@ -2093,7 +2097,7 @@ GO
                 int numoftotaldbrecords_after = getdbnumofrowsresult.Value;
                 Add(multirunresult, $"NUMOFRUNS", deleteruncounter.ToString());
-                Add(multirunresult, $"DBRECORDS", $"{numoftotaldbrecords_before}-->{numoftotaldbrecords_after}");
+                Add(multirunresult, $"DBRECORDS", $"{numoftotaldbrecords_before}-->{numoftotaldbrecords_after} (total:{numoftotaldbrecords_after-numoftotaldbrecords_before})");
                 Add(multirunresult, $"MINDATE", $"{mindateTS_before}-->{mindateTS_after}");
                 Add(multirunresult, $"PROCESSINGTIME", $"{DateTime.Now.Subtract(starttime)}");
                 return Finalize(0, multirunresult);
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.31.6.0")]
-[assembly: AssemblyFileVersion("1.31.6.0")]
+[assembly: AssemblyVersion("1.31.7.0")]
+[assembly: AssemblyFileVersion("1.31.7.0")]