diff --git a/MarketData/MarketData/Services/MainService.cs b/MarketData/MarketData/Services/MainService.cs index afda3e6..e44f8a0 100755 --- a/MarketData/MarketData/Services/MainService.cs +++ b/MarketData/MarketData/Services/MainService.cs @@ -322,7 +322,7 @@ namespace MarketData.Services UpdatePricesBigCharts(startDate); // bigcharts.marketwatch.com UpdatePricesYahooSweep(startDate); // The sweep variation of the method is intended to be used after the BigCharts update because the sweep will take pricing_source into consideration when fetching prices. resetEvents[STAGE_1].Set(); - SMSClient.SendSMSEmail("UPDATEDAILY2 UPDATEPRICESBIGCHARTS/YAHOO done.", smsUserName, smsRecipients, smsSMTPAddress, smsUserName, smsPassword); + SMSClient.SendSMSEmail("UPDATEDAILY2 STAGE_1 UPDATEPRICESBIGCHARTS/YAHOO done.", smsUserName, smsRecipients, smsSMTPAddress, smsUserName, smsPassword); MDTrace.WriteLine(LogLevel.DEBUG,$"STAGE_1 complete."); }); resetEvents[STAGE_1].WaitOne(); // wait for pricing to finish diff --git a/MarketData/MarketDataLib/Utility/Utility.cs b/MarketData/MarketDataLib/Utility/Utility.cs index fb5f9f6..1b49fca 100755 --- a/MarketData/MarketDataLib/Utility/Utility.cs +++ b/MarketData/MarketDataLib/Utility/Utility.cs @@ -86,7 +86,6 @@ namespace MarketData.Utils } } - public static void ExpireLogs(String pathLogFiles,int expiryDays) { DateTime currentDate = DateTime.Now; @@ -97,7 +96,9 @@ namespace MarketData.Utils try { DateTime creationTime = File.GetCreationTime(logFile); - int age = Math.Abs(dateGenerator.DaysBetweenActual(currentDate, creationTime)); + DateTime lastAccessTime = File.GetLastAccessTime(logFile); + DateTime earliestDate = lastAccessTime < creationTime? lastAccessTime : creationTime; + int age = Math.Abs(dateGenerator.DaysBetweenActual(currentDate, earliestDate)); Console.WriteLine($"[ExpireLogs ]{logFile} is {age} {(age>1?"days":"day")} old"); if(age>=expiryDays) { @@ -124,14 +125,17 @@ namespace MarketData.Utils { DateTime creationTime = File.GetCreationTime(logFile); DateTime lastWriteTime = File.GetLastWriteTime(logFile); + DateTime lastAccessTime = File.GetLastAccessTime(logFile); + DateTime earliestDate = lastAccessTime < creationTime? lastAccessTime : creationTime; FileAttributes attributes = File.GetAttributes(logFile); - int age = Math.Abs(dateGenerator.DaysBetweenActual(currentDate, creationTime)); + int age = Math.Abs(dateGenerator.DaysBetweenActual(currentDate, earliestDate)); StringBuilder sb = new StringBuilder(); sb.Append($"[ShowLogs] "); sb.Append($"'{logFile}'").Append(" "); sb.Append($"Age:").Append(age).Append(" "); sb.Append($"Created:").Append(creationTime.ToShortDateString()).Append(" "); sb.Append($"LastWrite:").Append(lastWriteTime.ToShortDateString()).Append(" "); + sb.Append($"LastAccess:").Append(lastAccessTime.ToShortDateString()).Append(" "); sb.Append(FileAttributesToString(attributes)); MDTrace.WriteLine(LogLevel.DEBUG,sb.ToString()); }