merge commit

This commit is contained in:
robvde 2013-03-09 15:15:23 +04:00
commit 5db8bd0fa1
7 changed files with 72 additions and 45 deletions

View file

@ -159,16 +159,17 @@ namespace WebsitePanel.EnterpriseServer
{
System.Threading.Thread.Sleep(1000);
}
counter++;
}
// 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();
// 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)
@ -177,7 +178,7 @@ namespace WebsitePanel.EnterpriseServer
{
TaskManager.WriteError(string.Format("RunSchedule Error : {0}", Ex.Message));
}
catch(Exception)
catch (Exception)
{
}
}