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

Schedulers fixed

Browse source
This commit is contained in:
vfedosevich 2013-06-03 14:07:52 +03:00
parent c8a8be8894
commit 645229bef1
17 changed files with 278 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

48
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Tasks/TaskController.cs
View file

@ -80,27 +80,57 @@ namespace WebsitePanel.EnterpriseServer
AddTaskParams(taskId, task.Params);
DataProvider.AddBackgroundTaskStack(taskId);
return taskId;
}
public static void UpdateTask(BackgroundTask task)
public static void UpdateTaskWithParams(BackgroundTask task)
{
if (UpdateTask(task))
{
UpdateBackgroundTaskParams(task);
}
}
public static bool UpdateTask(BackgroundTask task)
{
if (task.Status == BackgroundTaskStatus.Abort)
{
DeleteBackgroundTasks(task.Guid);
return false;
}
if (task.Completed)
{
DeleteBackgroundTask(task.Id);
return false;
}
DataProvider.UpdateBackgroundTask(task.Guid, task.Id, task.ScheduleId, task.PackageId, task.TaskName, task.ItemId,
task.ItemName, task.FinishDate, task.IndicatorCurrent,
task.IndicatorMaximum, task.MaximumExecutionTime, task.Source,
task.Severity, task.Completed, task.NotifyOnComplete, task.Status);
AddTaskParams(task.Id, task.Params);
if (task.Completed || task.Status == BackgroundTaskStatus.Abort)
{
DeleteTaskStack(task.Id);
}
return true;
}
public static void DeleteTaskStack(int taskId)
public static void UpdateBackgroundTaskParams(BackgroundTask task)
{
DataProvider.DeleteBackgroundTaskStack(taskId);
DataProvider.DeleteBackgroundTaskParams(task.Id);
AddTaskParams(task.Id, task.Params);
}
public static void DeleteBackgroundTasks(Guid guid)
{
DataProvider.DeleteBackgroundTasks(guid);
}
public static void DeleteBackgroundTask(int id)
{
DataProvider.DeleteBackgroundTask(id);
}
public static void AddTaskParams(int taskId, List<BackgroundTaskParameter> parameters)

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

@ -155,10 +155,13 @@ namespace WebsitePanel.EnterpriseServer
taskId = Guid.NewGuid().ToString("N");
}
int userId = SecurityContext.User.OwnerId;
int effectiveUserId = SecurityContext.User.IsPeer
? userId
: SecurityContext.User.UserId;
var user = SecurityContext.User;
int userId = user.OwnerId == 0
? user.UserId
: user.OwnerId;
int effectiveUserId = user.UserId;
String itemNameStr = itemName != null
? itemName.ToString()
@ -286,23 +289,12 @@ namespace WebsitePanel.EnterpriseServer
// write task execution result to database
if (tasks.Count == 1) // single task
{
// unregister task globally
// tasks.Remove(TopTask.TaskId);
// write to database
topTask.Logs = TaskController.GetLogs(topTask.Id, topTask.StartDate);
string executionLog = FormatExecutionLog(topTask);
UserInfo user = UserController.GetUserInternally(topTask.EffectiveUserId);
string username = user != null ? user.Username : null;
AuditLog.AddAuditLogRecord(topTask.TaskId, topTask.Severity, topTask.EffectiveUserId,
username, topTask.PackageId, topTask.ItemId,
topTask.ItemName, topTask.StartDate, topTask.FinishDate, topTask.Source,
topTask.TaskName, executionLog);
AddAuditLog(topTask);
}
TaskController.UpdateTask(topTask);
StopProcess(topTask);
}
public static void UpdateParam(String name, Object value)
@ -314,7 +306,7 @@ namespace WebsitePanel.EnterpriseServer
topTask.UpdateParamValue(name, value);
TaskController.UpdateTask(topTask);
TaskController.UpdateTaskWithParams(topTask);
}
public static int ItemId
@ -359,7 +351,7 @@ namespace WebsitePanel.EnterpriseServer
topTask.UpdateParamValue(key, parameters[key]);
}
TaskController.UpdateTask(topTask);
TaskController.UpdateTaskWithParams(topTask);
}
static string FormatExecutionLog(BackgroundTask task)
@ -535,7 +527,7 @@ namespace WebsitePanel.EnterpriseServer
scheduledTasks.Add(task.ScheduleId, task);
}
}
catch (Exception)
catch (Exception e)
{
}
return scheduledTasks;
@ -570,23 +562,51 @@ namespace WebsitePanel.EnterpriseServer
task.Status = BackgroundTaskStatus.Abort;
StopProcess(task.Id);
StopProcess(task);
if (!HasErrors(task))
{
task.Severity = 1;
}
task.FinishDate = DateTime.Now;
AddAuditLog(task);
TaskController.UpdateTask(task);
}
private static void StopProcess(int key)
private static void StopProcess(BackgroundTask task)
{
if (_taskThreadsDictionary.ContainsKey(key))
if (_taskThreadsDictionary.ContainsKey(task.Id))
{
if (_taskThreadsDictionary[key] != null)
if (_taskThreadsDictionary[key].IsAlive)
_taskThreadsDictionary[key].Abort();
if (_taskThreadsDictionary[task.Id] != null)
if (_taskThreadsDictionary[task.Id].IsAlive)
{
if (!task.Completed)
_taskThreadsDictionary[task.Id].Abort();
_taskThreadsDictionary[task.Id] = null;
}
Thread deleted;
_taskThreadsDictionary.TryRemove(key,out deleted);
_taskThreadsDictionary.TryRemove(task.Id, out deleted);
}
}
private static void AddAuditLog(BackgroundTask task)
{
task.Logs = TaskController.GetLogs(task.Id, task.StartDate);
string executionLog = FormatExecutionLog(task);
UserInfo user = UserController.GetUserInternally(task.EffectiveUserId);
string username = user != null ? user.Username : null;
AuditLog.AddAuditLogRecord(task.TaskId, task.Severity, task.EffectiveUserId,
username, task.PackageId, task.ItemId,
task.ItemName, task.StartDate, task.FinishDate, task.Source,
task.TaskName, executionLog);
}
public static List<BackgroundTask> GetUserTasks(int userId)
{
List<BackgroundTask> list = new List<BackgroundTask>();
@ -597,7 +617,7 @@ namespace WebsitePanel.EnterpriseServer
return list; // prohibited user
// get user tasks
foreach (BackgroundTask task in TaskController.GetTasks())
foreach (BackgroundTask task in TaskController.GetTasks(user.IsPeer ? user.OwnerId : user.UserId))
{
if (task.UserId == userId && !task.Completed
&& task.Status == BackgroundTaskStatus.Run)