jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scheduled tasks tidy up

Browse Source
This commit is contained in:
Gary Sharp
2016-09-28 20:39:24 +10:00
parent 27c21175d7
commit 86faf02cf0
12 changed files with 53 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Services/Users/CacheCleanTask.cs
+5 -9
View File
@@ -2,10 +2,6 @@
using Disco.Services.Tasks;
using Quartz;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Disco.Services.Users
{
@@ -22,16 +18,16 @@ namespace Disco.Services.Users
// Run @ every 15mins
// Next 15min interval
DateTime now = DateTime.Now;
int mins = (15 - (now.Minute % 15));
var now = DateTime.Now;
var mins = (15 - (now.Minute % 15));
if (mins < 10)
mins += 15;
DateTimeOffset startAt = new DateTimeOffset(now).AddMinutes(mins).AddSeconds(now.Second * -1).AddMilliseconds(now.Millisecond * -1);
var startAt = new DateTimeOffset(now).AddMinutes(mins).AddSeconds(now.Second * -1).AddMilliseconds(now.Millisecond * -1);
TriggerBuilder triggerBuilder = TriggerBuilder.Create().StartAt(startAt).
var triggerBuilder = TriggerBuilder.Create().StartAt(startAt).
WithSchedule(SimpleScheduleBuilder.RepeatMinutelyForever(15));
this.ScheduleTask(triggerBuilder);
ScheduleTask(triggerBuilder);
}
protected override void ExecuteTask()
Disco.Services/Users/UserFlags/UserFlagsBulkAssignTask.cs
+5 -5
View File
@@ -19,11 +19,11 @@ namespace Disco.Services.Users.UserFlags
protected override void ExecuteTask()
{
int UserFlagId = (int)this.ExecutionContext.JobDetail.JobDataMap["UserFlagId"];
string TechnicianUserId = (string)this.ExecutionContext.JobDetail.JobDataMap["TechnicianUserId"];
string Comments = (string)this.ExecutionContext.JobDetail.JobDataMap["Comments"];
List<string> UserIds = (List<string>)this.ExecutionContext.JobDetail.JobDataMap["UserIds"];
bool Override = (bool)this.ExecutionContext.JobDetail.JobDataMap["Override"];
int UserFlagId = (int)ExecutionContext.JobDetail.JobDataMap["UserFlagId"];
string TechnicianUserId = (string)ExecutionContext.JobDetail.JobDataMap["TechnicianUserId"];
string Comments = (string)ExecutionContext.JobDetail.JobDataMap["Comments"];
List<string> UserIds = (List<string>)ExecutionContext.JobDetail.JobDataMap["UserIds"];
bool Override = (bool)ExecutionContext.JobDetail.JobDataMap["Override"];
using (DiscoDataContext Database = new DiscoDataContext())
{
Disco.Services/Users/UserFlags/UserFlagsDeleteTask.cs
+2 -2
View File
@@ -14,7 +14,7 @@ namespace Disco.Services.Users.UserFlags
protected override void ExecuteTask()
{
int UserFlagId = (int)this.ExecutionContext.JobDetail.JobDataMap["UserFlagId"];
int UserFlagId = (int)ExecutionContext.JobDetail.JobDataMap["UserFlagId"];
using (DiscoDataContext Database = new DiscoDataContext())
{
@@ -24,7 +24,7 @@ namespace Disco.Services.Users.UserFlags
public static ScheduledTaskStatus ScheduleNow(int UserFlagId)
{
JobDataMap taskData = new JobDataMap() { { "UserFlagId", UserFlagId } };
var taskData = new JobDataMap() { { "UserFlagId", UserFlagId } };
var instance = new UserFlagDeleteTask();