Merge remote-tracking branch 'origin/6.2.1' into 7.1.5

This commit is contained in:
Shannon
2014-06-25 11:37:21 +10:00
2 changed files with 7 additions and 1 deletions

View File

@@ -30,7 +30,7 @@ namespace Umbraco.Web.Scheduling
try
{
var umbracoBaseUrl = ServerEnvironmentHelper.GetCurrentServerUmbracoBaseUrl();
var url = string.Format("{0}/RestServices/ScheduledPublish/", umbracoBaseUrl);
var url = string.Format("{0}/RestServices/ScheduledPublish/Index", umbracoBaseUrl);
using (var wc = new WebClient())
{
//pass custom the authorization header

View File

@@ -13,6 +13,10 @@ namespace Umbraco.Web.Scheduling
/// TODO: Much of this code is legacy and needs to be updated, there are a few new/better ways to do scheduling
/// in a web project nowadays.
///
/// //TODO: We need a much more robust way of handing scheduled tasks and also need to take into account app shutdowns during
/// a scheduled tasks operation
/// http://haacked.com/archive/2011/10/16/the-dangers-of-implementing-recurring-background-tasks-in-asp-net.aspx/
///
/// </remarks>
internal sealed class Scheduler : ApplicationEventHandler
{
@@ -25,6 +29,8 @@ namespace Umbraco.Web.Scheduling
if (umbracoApplication.Context == null)
return;
LogHelper.Debug<Scheduler>(() => "Initializing the scheduler");
// time to setup the tasks
// these are the legacy tasks