icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-02-10 02:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Using UTC for tracking durations

Browse Source
This commit is contained in:
Chris Cameron
2020-03-11 13:02:34 -04:00
parent ed2cf84a7e
commit e99a7f313f
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ICD.Common.Utils/ProcessorUtils.SimplSharp.cs
View File

@@ -21,8 +21,8 @@ namespace ICD.Common.Utils
private static string s_VersionResult;
private static DateTime? s_SystemUptimeStartTime;
private static DateTime? s_ProgramUptimeStartTime;
private static DateTime? s_SystemUptimeStartTimeUtc;
private static DateTime? s_ProgramUptimeStartTimeUtc;
#region Properties
@@ -237,7 +237,7 @@ namespace ICD.Common.Utils
[PublicAPI]
public static TimeSpan GetSystemUptime()
{
if (s_SystemUptimeStartTime == null)
if (s_SystemUptimeStartTimeUtc == null)
{
string uptime = GetSystemUptimeFeedback();
Match match = Regex.Match(uptime, UPTIME_REGEX);
@@ -251,10 +251,10 @@ namespace ICD.Common.Utils
int milliseconds = int.Parse(match.Groups["milliseconds"].Value);
TimeSpan span = new TimeSpan(days, hours, minutes, seconds, milliseconds);
s_SystemUptimeStartTime = IcdEnvironment.GetLocalTime() - span;
s_SystemUptimeStartTimeUtc = IcdEnvironment.GetUtcTime() - span;
}
return IcdEnvironment.GetLocalTime() - s_SystemUptimeStartTime.Value;
return IcdEnvironment.GetUtcTime() - s_SystemUptimeStartTimeUtc.Value;
}
/// <summary>
@@ -264,7 +264,7 @@ namespace ICD.Common.Utils
[PublicAPI]
public static TimeSpan GetProgramUptime()
{
if (s_ProgramUptimeStartTime == null)
if (s_ProgramUptimeStartTimeUtc == null)
{
string uptime = GetProgramUptimeFeedback((int)ProgramUtils.ProgramNumber);
Match match = Regex.Match(uptime, UPTIME_REGEX);
@@ -278,10 +278,10 @@ namespace ICD.Common.Utils
int milliseconds = int.Parse(match.Groups["milliseconds"].Value);
TimeSpan span = new TimeSpan(days, hours, minutes, seconds, milliseconds);
s_ProgramUptimeStartTime = IcdEnvironment.GetLocalTime() - span;
s_ProgramUptimeStartTimeUtc = IcdEnvironment.GetUtcTime() - span;
}
return IcdEnvironment.GetLocalTime() - s_ProgramUptimeStartTime.Value;
return IcdEnvironment.GetUtcTime() - s_ProgramUptimeStartTimeUtc.Value;
}
#endregion