From 864994a56e0add91fa6329765ca7bc026a560ebf Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 8 Dec 2014 17:04:22 +1100 Subject: [PATCH] updates error msgs when sending requests to the same server pointing to docs on baseUrl --- src/Umbraco.Web/Scheduling/KeepAlive.cs | 7 ++++--- src/Umbraco.Web/Scheduling/ScheduledPublishing.cs | 8 +++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web/Scheduling/KeepAlive.cs b/src/Umbraco.Web/Scheduling/KeepAlive.cs index d2db1ac3ff..45e2558c08 100644 --- a/src/Umbraco.Web/Scheduling/KeepAlive.cs +++ b/src/Umbraco.Web/Scheduling/KeepAlive.cs @@ -13,8 +13,7 @@ namespace Umbraco.Web.Scheduling { using (DisposableTimer.DebugDuration(() => "Keep alive executing", () => "Keep alive complete")) { - var umbracoBaseUrl = ServerEnvironmentHelper.GetCurrentServerUmbracoBaseUrl( - appContext); + var umbracoBaseUrl = ServerEnvironmentHelper.GetCurrentServerUmbracoBaseUrl(appContext); if (string.IsNullOrWhiteSpace(umbracoBaseUrl)) { @@ -33,7 +32,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/ScheduledPublishing.cs b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs index 7b4969d512..97e26e405a 100644 --- a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs +++ b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs @@ -39,10 +39,10 @@ namespace Umbraco.Web.Scheduling _isPublishingRunning = true; + var umbracoBaseUrl = ServerEnvironmentHelper.GetCurrentServerUmbracoBaseUrl(_appContext); + try { - var umbracoBaseUrl = ServerEnvironmentHelper.GetCurrentServerUmbracoBaseUrl(_appContext); - if (string.IsNullOrWhiteSpace(umbracoBaseUrl)) { LogHelper.Warn("No url for service (yet), skip."); @@ -61,7 +61,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 {