Commit 34b4dbe8c6a6c4bebe8694b27b4c5efa0b543d6c
1 parent
066d6e6f
v1.31.7.0
Showing
2 changed files
with
26 additions
and
22 deletions
Show diff stats
Vrh.Log4Pro.MaintenanceConsole/Manager - SQLDataBaseManager.cs
| ... | ... | @@ -2052,36 +2052,40 @@ GO |
| 2052 | 2052 | if (limitdatefornextrun >= par_limitdate) break; |
| 2053 | 2053 | limitdatefornextrun = limitdatefornextrun + par_lengthofonerun; |
| 2054 | 2054 | var loople = new List<KeyValuePair<string, string>>(); |
| 2055 | + var loopstart = DateTime.Now; | |
| 2055 | 2056 | if (limitdatefornextrun > par_limitdate) limitdatefornextrun = par_limitdate; |
| 2056 | 2057 | Add(loople, $"RUN#{deleteruncounter}"); |
| 2057 | - try | |
| 2058 | - { | |
| 2059 | - sqltxt = Tools.KvpString.Substitute($"{RUNNINGMODE}={RUNNINGMODE_ONERUN};{RUNNINGMODE_ONERUN_PARAMETER_DELETEBEFOREDATE}={limitdatefornextrun:s};", sqltxtalmostresolved); | |
| 2060 | - if (sqltxt == null) { return Finalize(1, Add(multirunresult, ERRMSG_NOTHINGTOEXECUTE)); } //won't really get, but we never know... | |
| 2061 | - ret1 = ExecuteSQLScript(sqlc, sqltxt, sqlscript.CommandTimeout, null); | |
| 2062 | - Add(loople, $"LIMITDATE", limitdatefornextrun.ToString()); | |
| 2063 | - Add(loople, $"RETCODE", ret1.ReturnValue.ToString()); | |
| 2064 | - Add(loople, $"RETMSG", ret1.ReturnMessage); | |
| 2058 | + try | |
| 2059 | + { | |
| 2060 | + sqltxt = Tools.KvpString.Substitute($"{RUNNINGMODE}={RUNNINGMODE_ONERUN};{RUNNINGMODE_ONERUN_PARAMETER_DELETEBEFOREDATE}={limitdatefornextrun:s};", sqltxtalmostresolved); | |
| 2061 | + if (sqltxt == null) { return Finalize(1, Add(multirunresult, ERRMSG_NOTHINGTOEXECUTE)); } //won't really get, but we never know... | |
| 2062 | + ret1 = ExecuteSQLScript(sqlc, sqltxt, sqlscript.CommandTimeout, null); | |
| 2063 | + Add(loople, $"LIMITDATE", limitdatefornextrun.ToString()); | |
| 2064 | + Add(loople, $"RETCODE", ret1.ReturnValue.ToString()); | |
| 2065 | + Add(loople, $"RETMSG", ret1.ReturnMessage); | |
| 2066 | + Add(loople, $"PROCESSINGTIME", DateTime.Now.Subtract(loopstart).ToString()); | |
| 2065 | 2067 | |
| 2066 | 2068 | deleteruncounter++; |
| 2067 | - exceptioncounter = 0; | |
| 2068 | - runresult = 0; | |
| 2069 | - } | |
| 2070 | - catch (Exception ex) | |
| 2071 | - { | |
| 2072 | - exceptioncounter++; | |
| 2073 | - string errmsg = ""; while (ex != null) { errmsg += ex.Message; ex = ex.InnerException; } | |
| 2074 | - Add(loople, $"EXCEPTION RESULT DeleteRun", errmsg); | |
| 2069 | + exceptioncounter = 0; | |
| 2070 | + runresult = 0; | |
| 2071 | + } | |
| 2072 | + catch (Exception ex) | |
| 2073 | + { | |
| 2074 | + exceptioncounter++; | |
| 2075 | + string errmsg = ""; while (ex != null) { errmsg += ex.Message; ex = ex.InnerException; } | |
| 2076 | + Add(loople, $"EXCEPTION RESULT DeleteRun", errmsg); | |
| 2077 | + Add(loople, $"PROCESSINGTIME", DateTime.Now.Subtract(loopstart).ToString()); | |
| 2075 | 2078 | runresult = 1; |
| 2076 | - if (exceptioncounter > MAXEXCEPTIONS) { return Finalize(1, multirunresult); } | |
| 2077 | - } | |
| 2079 | + if (exceptioncounter > MAXEXCEPTIONS) { return Finalize(1, multirunresult); } | |
| 2080 | + } | |
| 2081 | + | |
| 2082 | + | |
| 2078 | 2083 | var waitforexitloopTS = par_delaybetweenruns.Ticks > new TimeSpan(0, 0, 5).Ticks ? par_delaybetweenruns : new TimeSpan(0, 0, 5); |
| 2079 | 2084 | var exitfromloop = (ExitAtThisPoint?.Invoke(Finalize(runresult, loople), waitforexitloopTS)) ?? false; |
| 2080 | 2085 | if (exitfromloop) { Add(multirunresult, $"Exit requested by user"); break; } |
| 2081 | 2086 | var remainingMSforsleep = par_delaybetweenruns.Add(waitforexitloopTS.Negate()).TotalMilliseconds; |
| 2082 | 2087 | if (remainingMSforsleep > 0) { Thread.Sleep((int)(remainingMSforsleep)); } |
| 2083 | 2088 | } |
| 2084 | - | |
| 2085 | 2089 | //get minimum date in the database |
| 2086 | 2090 | getdbmindateresult = GetDBMindate(sqltxtalmostresolved, multirunresult, sqlscript.CommandTimeout, sqlc); |
| 2087 | 2091 | if (getdbmindateresult == null) return Finalize(1, multirunresult); |
| ... | ... | @@ -2093,7 +2097,7 @@ GO |
| 2093 | 2097 | int numoftotaldbrecords_after = getdbnumofrowsresult.Value; |
| 2094 | 2098 | |
| 2095 | 2099 | Add(multirunresult, $"NUMOFRUNS", deleteruncounter.ToString()); |
| 2096 | - Add(multirunresult, $"DBRECORDS", $"{numoftotaldbrecords_before}-->{numoftotaldbrecords_after}"); | |
| 2100 | + Add(multirunresult, $"DBRECORDS", $"{numoftotaldbrecords_before}-->{numoftotaldbrecords_after} (total:{numoftotaldbrecords_after-numoftotaldbrecords_before})"); | |
| 2097 | 2101 | Add(multirunresult, $"MINDATE", $"{mindateTS_before}-->{mindateTS_after}"); |
| 2098 | 2102 | Add(multirunresult, $"PROCESSINGTIME", $"{DateTime.Now.Subtract(starttime)}"); |
| 2099 | 2103 | return Finalize(0, multirunresult); | ... | ... |
Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
| ... | ... | @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; |
| 32 | 32 | // You can specify all the values or you can default the Build and Revision Numbers |
| 33 | 33 | // by using the '*' as shown below: |
| 34 | 34 | // [assembly: AssemblyVersion("1.0.*")] |
| 35 | -[assembly: AssemblyVersion("1.31.6.0")] | |
| 36 | -[assembly: AssemblyFileVersion("1.31.6.0")] | |
| 35 | +[assembly: AssemblyVersion("1.31.7.0")] | |
| 36 | +[assembly: AssemblyFileVersion("1.31.7.0")] | ... | ... |