diff --git a/src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs b/src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs index 52480a1ca7..1d5ee7855a 100644 --- a/src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs +++ b/src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs @@ -59,7 +59,7 @@ namespace Umbraco.Core.Sync server.ServerAddress, server.ForcePortnumber.IsNullOrWhiteSpace() ? "80" : server.ForcePortnumber, IOHelper.ResolveUrl(SystemDirectories.Umbraco).TrimStart('/')); - } + } } // cannot be determined, return null if no config/original url, else use config/original url as base @@ -86,7 +86,7 @@ namespace Umbraco.Core.Sync } var master = servers.FirstOrDefault(); - + if (master == null) { return CurrentServerEnvironmentStatus.Unknown; @@ -105,12 +105,12 @@ namespace Umbraco.Core.Sync } if ((appId.IsNullOrWhiteSpace() == false && appId.Trim().InvariantEquals(HttpRuntime.AppDomainAppId)) - || (serverName.IsNullOrWhiteSpace() == false && serverName.Trim().InvariantEquals(NetworkHelper.MachineName))) + || (serverName.IsNullOrWhiteSpace() == false && serverName.Trim().InvariantEquals(NetworkHelper.MachineName))) { //match by appdid or server name! - return CurrentServerEnvironmentStatus.Master; + return CurrentServerEnvironmentStatus.Master; } - + return CurrentServerEnvironmentStatus.Slave; } diff --git a/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs b/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs index 8162b27c62..8b1981bc9e 100644 --- a/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs +++ b/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs @@ -230,7 +230,7 @@ namespace Umbraco.Tests.Scheduling //wait till the thread is done await tManager; - + foreach (var task in tasks) { Assert.IsTrue(task.Ended != default(DateTime)); @@ -241,6 +241,7 @@ namespace Umbraco.Tests.Scheduling Assert.IsFalse(tManager.IsDisposed); } } + private class MyTask : BaseTask { diff --git a/src/Umbraco.Web.UI/Global.asax b/src/Umbraco.Web.UI/Global.asax index 1627b363bc..8cb0d2d910 100644 --- a/src/Umbraco.Web.UI/Global.asax +++ b/src/Umbraco.Web.UI/Global.asax @@ -1 +1 @@ -<%@ Application Codebehind="Global.asax.cs" Inherits="Umbraco.Web.UmbracoApplication" Language="C#" %> +<%@ Application Inherits="Umbraco.Web.UmbracoApplication" Language="C#" %> diff --git a/src/Umbraco.Web.UI/web.Template.Debug.config b/src/Umbraco.Web.UI/web.Template.Debug.config index d5901a5c5e..732e2e76ce 100644 --- a/src/Umbraco.Web.UI/web.Template.Debug.config +++ b/src/Umbraco.Web.UI/web.Template.Debug.config @@ -134,6 +134,13 @@ + + + + + + diff --git a/src/Umbraco.Web/Scheduling/IBackgroundTask.cs b/src/Umbraco.Web/Scheduling/IBackgroundTask.cs index 3e0bddfddb..343f076b2a 100644 --- a/src/Umbraco.Web/Scheduling/IBackgroundTask.cs +++ b/src/Umbraco.Web/Scheduling/IBackgroundTask.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace Umbraco.Web.Scheduling { diff --git a/src/Umbraco.Web/Scheduling/KeepAlive.cs b/src/Umbraco.Web/Scheduling/KeepAlive.cs index 67a2f4a448..c1b43b57c6 100644 --- a/src/Umbraco.Web/Scheduling/KeepAlive.cs +++ b/src/Umbraco.Web/Scheduling/KeepAlive.cs @@ -35,7 +35,9 @@ namespace Umbraco.Web.Scheduling } catch (Exception ee) { - LogHelper.Error("Error in ping", ee); + LogHelper.Error( + string.Format("Error in ping. The base url used in the request was: {0}, see http://our.umbraco.org/documentation/Using-Umbraco/Config-files/umbracoSettings/#ScheduledTasks documentation for details on setting a baseUrl if this is in error", umbracoBaseUrl) + , ee); } } } diff --git a/src/Umbraco.Web/Scheduling/LogScrubber.cs b/src/Umbraco.Web/Scheduling/LogScrubber.cs index 933e6d7c6b..538ed24c85 100644 --- a/src/Umbraco.Web/Scheduling/LogScrubber.cs +++ b/src/Umbraco.Web/Scheduling/LogScrubber.cs @@ -8,7 +8,6 @@ using Umbraco.Core.Logging; namespace Umbraco.Web.Scheduling { - internal class LogScrubber : DisposableObject, IBackgroundTask { private readonly ApplicationContext _appContext; @@ -49,6 +48,7 @@ namespace Umbraco.Web.Scheduling { Log.CleanLogs(GetLogScrubbingMaximumAge(_settings)); } + } } } } \ No newline at end of file diff --git a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs index 1a4cafbc42..678bf98577 100644 --- a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs +++ b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs @@ -42,6 +42,8 @@ namespace Umbraco.Web.Scheduling _isPublishingRunning = true; + var umbracoBaseUrl = ServerEnvironmentHelper.GetCurrentServerUmbracoBaseUrl(_appContext); + try { var umbracoBaseUrl = ServerEnvironmentHelper.GetCurrentServerUmbracoBaseUrl(_appContext, _settings); @@ -64,7 +66,9 @@ namespace Umbraco.Web.Scheduling } catch (Exception ee) { - LogHelper.Error("An error occurred with the scheduled publishing", ee); + LogHelper.Error( + string.Format("An error occurred with the scheduled publishing. The base url used in the request was: {0}, see http://our.umbraco.org/documentation/Using-Umbraco/Config-files/umbracoSettings/#ScheduledTasks documentation for details on setting a baseUrl if this is in error", umbracoBaseUrl) + , ee); } finally { diff --git a/src/Umbraco.Web/Scheduling/ScheduledTasks.cs b/src/Umbraco.Web/Scheduling/ScheduledTasks.cs index cfebfbb246..94c035631f 100644 --- a/src/Umbraco.Web/Scheduling/ScheduledTasks.cs +++ b/src/Umbraco.Web/Scheduling/ScheduledTasks.cs @@ -21,7 +21,6 @@ namespace Umbraco.Web.Scheduling private readonly ApplicationContext _appContext; private readonly IUmbracoSettingsSection _settings; private static readonly Hashtable ScheduledTaskTimes = new Hashtable(); - private static bool _isPublishingRunning = false; public ScheduledTasks(ApplicationContext appContext, IUmbracoSettingsSection settings) @@ -32,8 +31,6 @@ namespace Umbraco.Web.Scheduling private void ProcessTasks() { - - var scheduledTasks = _settings.ScheduledTasks.Tasks; foreach (var t in scheduledTasks) { diff --git a/src/Umbraco.Web/Scheduling/Scheduler.cs b/src/Umbraco.Web/Scheduling/Scheduler.cs index 5944c301d4..3d5b977b68 100644 --- a/src/Umbraco.Web/Scheduling/Scheduler.cs +++ b/src/Umbraco.Web/Scheduling/Scheduler.cs @@ -100,6 +100,10 @@ namespace Umbraco.Web.Scheduling _scrubberRunner.Add(new LogScrubber(appContext, settings)); } + private static void PerformLogScrub(ApplicationContext appContext) + { + _scrubberRunner.Add(new LogScrubber(appContext)); + } /// /// This performs all of the scheduling on the one timer /// @@ -140,7 +144,6 @@ namespace Umbraco.Web.Scheduling } } } - } } diff --git a/src/Umbraco.Web/Scheduling/TaskEventArgs.cs b/src/Umbraco.Web/Scheduling/TaskEventArgs.cs index 2ce64a239f..27e5174616 100644 --- a/src/Umbraco.Web/Scheduling/TaskEventArgs.cs +++ b/src/Umbraco.Web/Scheduling/TaskEventArgs.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace Umbraco.Web.Scheduling { diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 85bc54c778..e6f450189d 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -1,4 +1,4 @@ - + @@ -493,7 +493,6 @@ - @@ -578,10 +577,12 @@ + +