zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update OnScheduler issues.

Browse source
This commit is contained in:
robvde 2013-02-02 16:01:38 +04:00
parent 1297722c6a
commit b7ab52690e
4 changed files with 54 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

1
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/OrganizationController.cs
View file

@ -2132,6 +2132,7 @@ namespace WebsitePanel.EnterpriseServer
catch(Exception ex) catch(Exception ex)
{ {
TaskManager.WriteError(ex); TaskManager.WriteError(ex);
res.IsSuccess = false;
} }
return res; return res;
} }

62
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Scheduling/Scheduler.cs
View file

@ -40,9 +40,9 @@ namespace WebsitePanel.EnterpriseServer
public sealed class Scheduler public sealed class Scheduler
{ {
static SchedulerJob nextSchedule = null; public static SchedulerJob nextSchedule = null;
// main timer // main timer and put it to sleep
static Timer scheduleTimer = new Timer(new TimerCallback(RunNextSchedule), static Timer scheduleTimer = new Timer(new TimerCallback(RunNextSchedule),
null, null,
Timeout.Infinite, Timeout.Infinite,
@ -92,6 +92,8 @@ namespace WebsitePanel.EnterpriseServer
// this will put the timer to sleep // this will put the timer to sleep
scheduleTimer.Change(Timeout.Infinite, Timeout.Infinite); scheduleTimer.Change(Timeout.Infinite, Timeout.Infinite);
System.Threading.Thread.Sleep(1000);
// run immediately // run immediately
RunNextSchedule(null); RunNextSchedule(null);
} }
@ -122,31 +124,41 @@ namespace WebsitePanel.EnterpriseServer
static void RunSchedule(SchedulerJob schedule, bool changeNextRun) static void RunSchedule(SchedulerJob schedule, bool changeNextRun)
{ {
// update next run (if required)
if (changeNextRun)
try
{ {
SchedulerController.CalculateNextStartTime(schedule.ScheduleInfo); // update next run (if required)
if (changeNextRun)
{
SchedulerController.CalculateNextStartTime(schedule.ScheduleInfo);
}
// disable run once task
if (schedule.ScheduleInfo.ScheduleType == ScheduleType.OneTime)
schedule.ScheduleInfo.Enabled = false;
Dictionary<int, BackgroundTask> scheduledTasks = TaskManager.GetScheduledTasks();
if (!scheduledTasks.ContainsKey(schedule.ScheduleInfo.ScheduleId))
// this task should be run, so
// update its last run
schedule.ScheduleInfo.LastRun = DateTime.Now;
// update schedule
SchedulerController.UpdateSchedule(schedule.ScheduleInfo);
// skip execution if the current task is still running
scheduledTasks = TaskManager.GetScheduledTasks();
if (!scheduledTasks.ContainsKey(schedule.ScheduleInfo.ScheduleId))
{
// run the schedule in the separate thread
schedule.Run();
}
}
catch (Exception Ex)
{
TaskManager.WriteError(string.Format("RunSchedule Error : {0}", Ex.Message));
} }
// disable run once task
if (schedule.ScheduleInfo.ScheduleType == ScheduleType.OneTime)
schedule.ScheduleInfo.Enabled = false;
Dictionary<int, BackgroundTask> scheduledTasks = TaskManager.GetScheduledTasks();
if (!scheduledTasks.ContainsKey(schedule.ScheduleInfo.ScheduleId))
// this task should be run, so
// update its last run
schedule.ScheduleInfo.LastRun = DateTime.Now;
// update schedule
SchedulerController.UpdateSchedule(schedule.ScheduleInfo);
// skip execution if the current task is still running
if (scheduledTasks.ContainsKey(schedule.ScheduleInfo.ScheduleId))
return;
// run the schedule in the separate thread
schedule.Run();
} }
} }
} }

17
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Tasks/TaskManager.cs
View file

@ -150,8 +150,8 @@ namespace WebsitePanel.EnterpriseServer
{ {
// ERROR // ERROR
WriteLogRecord(2, ex.Message, ex.StackTrace); WriteLogRecord(2, ex.Message, ex.StackTrace);
return new Exception(String.Format("Error executing '{0}' task on '{1}' {2}", return new Exception((TopTask != null) ? String.Format("Error executing '{0}' task on '{1}' {2}",
TopTask.TaskName, TopTask.ItemName, TopTask.Source), ex); TopTask.TaskName, TopTask.ItemName, TopTask.Source) : String.Format("Error executing task"), ex);
} }
public static void WriteError(Exception ex, string text, params string[] textParameters) public static void WriteError(Exception ex, string text, params string[] textParameters)
@ -182,12 +182,15 @@ namespace WebsitePanel.EnterpriseServer
logRecord.TextParameters = textParameters; logRecord.TextParameters = textParameters;
logRecord.TextIdent = TasksStack.Count - 1; logRecord.TextIdent = TasksStack.Count - 1;
logRecord.ExceptionStackTrace = stackTrace; logRecord.ExceptionStackTrace = stackTrace;
RootTask.LogRecords.Add(logRecord); if (RootTask != null)
RootTask.LastLogRecord = logRecord; {
RootTask.LogRecords.Add(logRecord);
RootTask.LastLogRecord = logRecord;
// change entire task severity // change entire task severity
if (severity > RootTask.Severity) if (severity > RootTask.Severity)
RootTask.Severity = severity; RootTask.Severity = severity;
}
} }
public static void CompleteTask() public static void CompleteTask()

7
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Global.asax.cs
View file

@ -46,7 +46,12 @@ namespace WebsitePanel.EnterpriseServer
protected void Application_Start(object sender, EventArgs e) protected void Application_Start(object sender, EventArgs e)
{ {
Scheduler.Start(); if (ConfigurationManager.AppSettings["WebsitePanel.DistableScheduler"] != null)
if (Boolean.Parse(ConfigurationManager.AppSettings["WebsitePanel.DistableScheduler"]) == false)
{
if (Scheduler.nextSchedule == null)
Scheduler.Start();
}
} }
protected void Application_End(object sender, EventArgs e) protected void Application_End(object sender, EventArgs e)