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

Fixing bugs (Scheduler)

Browse source
This commit is contained in:
vfedosevich 2013-05-28 17:55:44 +03:00
parent bcceb95f92
commit e8ed10a67b
7 changed files with 36 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -97,18 +97,20 @@ namespace WebsitePanel.EnterpriseServer
private static void RunManualTasks()
{
var tasks = TaskController.GetProcessTasks(BackgroundTaskStatus.Starting);
var tasks = TaskController.GetProcessTasks(BackgroundTaskStatus.Stopping);
foreach (var task in tasks)
{
new Thread(() => RunBackgroundTask(task)) {Priority = ThreadPriority.Highest}.Start();
TaskManager.StopTask(task.TaskId);
}
tasks = TaskController.GetProcessTasks(BackgroundTaskStatus.Stopping);
tasks = TaskController.GetProcessTasks(BackgroundTaskStatus.Starting);
foreach (var task in tasks)
{
TaskManager.StopTask(task);
var taskThread = new Thread(() => RunBackgroundTask(task)) { Priority = ThreadPriority.Highest };
taskThread.Start();
TaskManager.AddTaskThread(task, taskThread);
}
}
@ -130,8 +132,6 @@ namespace WebsitePanel.EnterpriseServer
var objTask = (SchedulerTask)Activator.CreateInstance(Type.GetType(schedule.Task.TaskType));
objTask.DoWork();
Thread.Sleep(100000);
}
catch (Exception ex)
{

2
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Scheduling/SchedulerController.cs
View file

@ -165,7 +165,7 @@ namespace WebsitePanel.EnterpriseServer
var backgroundTask = new BackgroundTask(
Guid.NewGuid(),
schedule.ScheduleInfo.TaskId,
Guid.NewGuid().ToString("N"),
SecurityContext.User.UserId,
SecurityContext.User.IsPeer
? SecurityContext.User.OwnerId

3
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Scheduling/SchedulerJob.cs
View file

@ -66,7 +66,6 @@ namespace WebsitePanel.EnterpriseServer
{
// create worker
Thread worker = new Thread(new ThreadStart(RunSchedule));
// set worker priority
switch (scheduleInfo.Priority)
{
@ -109,7 +108,7 @@ namespace WebsitePanel.EnterpriseServer
objTask.DoWork();
else
throw new Exception(String.Format("Could not create scheduled task of '{0}' type",
task.TaskType));
task.TaskType));
}
catch (Exception ex)
{