VRH / VRH.Log4Pro.MaintenanceConsole

Commit 066d6e6fa3a3fe4a2c2e9290dcf02034700ac587

Authored by Schwirg László
1 parent 35f1afcb

v1.31.6.0

Showing 3 changed files with 7 additions and 6 deletions   Show diff stats
Inline Side-by-side
Vrh.Log4Pro.MaintenanceConsole/Manager - SQLDataBaseManager.cs
  Show/Hide comments   View file @066d6e6
@@ -2075,9 +2075,11 @@ GO @@ -2075,9 +2075,11 @@ GO
2075 runresult = 1; 2075 runresult = 1;
2076 if (exceptioncounter > MAXEXCEPTIONS) { return Finalize(1, multirunresult); } 2076 if (exceptioncounter > MAXEXCEPTIONS) { return Finalize(1, multirunresult); }
2077 } 2077 }
2078 - var exitfromloop = (ExitAtThisPoint?.Invoke(Finalize(runresult, loople), new TimeSpan(0, 0, 5))) ?? false; 2078 + var waitforexitloopTS = par_delaybetweenruns.Ticks > new TimeSpan(0, 0, 5).Ticks ? par_delaybetweenruns : new TimeSpan(0, 0, 5);
  2079 + var exitfromloop = (ExitAtThisPoint?.Invoke(Finalize(runresult, loople), waitforexitloopTS)) ?? false;
2079 if (exitfromloop) { Add(multirunresult, $"Exit requested by user"); break; } 2080 if (exitfromloop) { Add(multirunresult, $"Exit requested by user"); break; }
2080 - Thread.Sleep((int)(par_delaybetweenruns.TotalMilliseconds)); 2081 + var remainingMSforsleep = par_delaybetweenruns.Add(waitforexitloopTS.Negate()).TotalMilliseconds;
  2082 + if (remainingMSforsleep > 0) { Thread.Sleep((int)(remainingMSforsleep)); }
2081 } 2083 }
2082 2084
2083 //get minimum date in the database 2085 //get minimum date in the database
Vrh.Log4Pro.MaintenanceConsole/Program.cs
  Show/Hide comments   View file @066d6e6
@@ -39,8 +39,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole @@ -39,8 +39,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole
39 { 39 {
40 static void Main(string[] args) 40 static void Main(string[] args)
41 { 41 {
42 - //TESTS.TimeSpanFormatTest();  
43 - //TESTS.MSMQTest(); 42 + //bool xxxx = new TimeSpan(0, 0, 15).Add(new TimeSpan(0, 0, 25).Negate()).Ticks > 0;
44 //return; 43 //return;
45 var forcedmodulekey = CommandLine.GetCommandLineArgument(args, CLP.CMD_MODULE); 44 var forcedmodulekey = CommandLine.GetCommandLineArgument(args, CLP.CMD_MODULE);
46 var commandmode = !string.IsNullOrEmpty(forcedmodulekey); 45 var commandmode = !string.IsNullOrEmpty(forcedmodulekey);
Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
  Show/Hide comments   View file @066d6e6
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices; @@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
32 // You can specify all the values or you can default the Build and Revision Numbers 32 // You can specify all the values or you can default the Build and Revision Numbers
33 // by using the '*' as shown below: 33 // by using the '*' as shown below:
34 // [assembly: AssemblyVersion("1.0.*")] 34 // [assembly: AssemblyVersion("1.0.*")]
35 -[assembly: AssemblyVersion("1.31.5.0")]  
36 -[assembly: AssemblyFileVersion("1.31.5.0")] 35 +[assembly: AssemblyVersion("1.31.6.0")]
  36 +[assembly: AssemblyFileVersion("1.31.6.0")]