Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix random duplication and/or spamming by backup timer #38

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix random duplication and/or spamming by backup timer #38

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
404718c
Combine callbacks to try to fix timer issues
tomrhollis Oct 14, 2020
a08a800
parse & set rewritten to see if that fixes
tomrhollis Oct 15, 2020
278819a
missed assignment
tomrhollis Oct 17, 2020
a011f7c
add 2 second buffer to work around randomly short timers
tomrhollis Oct 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 15 additions & 29 deletions src/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,50 +291,36 @@ public VellumHost(string[] args)
else
Console.WriteLine("Skipping this backup because no players were online since the last one was taken...");
}
};

if (RunConfig.Backups.EnableSchedule && RunConfig.Backups.Schedule.Length > 0)
{
backupIntervalTimer.Elapsed += (object sender, ElapsedEventArgs e) =>
{
if (RunConfig.Backups.EnableSchedule && RunConfig.Backups.Schedule.Length > 0)
{
// Check which entry is up next
TimeSpan nextSpan = TimeSpan.MaxValue;
DateTime backupTime = DateTime.Now;

foreach (string clockTime in RunConfig.Backups.Schedule)
{
// Parse & validate entry
// Match match = Regex.Match(clockTime, @"^\s*(\d{1,2})\s*:\s*(\d{1,2})\s*([aApP][mM])"); // 12h format
Match match = Regex.Match(clockTime, @"^\s*(\d{1,2})\s*:\s*(\d{1,2})\s*$"); // 24h format

bool valid = false;
int hour, minute;

if (match.Groups.Count == 3)
try
{
hour = Convert.ToInt32(match.Groups[1].Value);
minute = Convert.ToInt32(match.Groups[2].Value);

if ((hour >= 0 && hour <= 23) && (minute >= 0 && minute <= 59))
{
valid = true;

TimeSpan span = new TimeSpan((hour == 0 ? 24 : hour) - DateTime.Now.Hour, minute - DateTime.Now.Minute, 0 - DateTime.Now.Second);

if (span.TotalSeconds > 0 && span < nextSpan)
nextSpan = span;
}
backupTime = DateTime.Parse(clockTime);
}

if (!valid)
catch (FormatException)
{
Console.WriteLine($"Invalid schedule entry \"{clockTime}\" in \"{_configPath}\"!");
continue;
}
// 2 second buffer to fix this timer sometimes jumping the gun by a few hundred milliseconds -TH
if (backupTime < DateTime.Now.AddSeconds(2)) backupTime = backupTime.AddDays(1);
TimeSpan span = backupTime.Subtract(DateTime.Now);
if (span.TotalSeconds > 2 && span < nextSpan) nextSpan = span;
}

// Set the new interval
Console.WriteLine($"Next scheduled backup is at {(DateTime.Now + nextSpan).ToShortTimeString()} (in {nextSpan.Days} days, {nextSpan.Hours} hours, {nextSpan.Minutes} minutes and {nextSpan.Seconds} seconds)");
backupIntervalTimer.Interval = nextSpan.TotalMilliseconds;
CallHook((byte)Hook.BACKUP_SCHEDULED, new HookEventArgs() { Attachment = nextSpan });
};
}
}
};

backupIntervalTimer.Start();

Expand Down