diff --git a/build/NuSpecs/tools/Dashboard.config.install.xdt b/build/NuSpecs/tools/Dashboard.config.install.xdt
index 8368870186..036beeba29 100644
--- a/build/NuSpecs/tools/Dashboard.config.install.xdt
+++ b/build/NuSpecs/tools/Dashboard.config.install.xdt
@@ -41,16 +41,6 @@
views/dashboard/developer/examinemanagement.html
-
-
- views/dashboard/developer/healthcheck.html
-
-
-
-
- views/dashboard/developer/redirecturls.html
-
-
+
+
+
+ content
+
+
+
+ views/dashboard/developer/redirecturls.html
+
+
+
+
+
+
+ developer
+
+
+
+ views/dashboard/developer/healthcheck.html
+
+
+
\ No newline at end of file
diff --git a/src/Umbraco.Core/Logging/Logger.cs b/src/Umbraco.Core/Logging/Logger.cs
index ae8bb60fcd..66cad59733 100644
--- a/src/Umbraco.Core/Logging/Logger.cs
+++ b/src/Umbraco.Core/Logging/Logger.cs
@@ -2,6 +2,7 @@
using System.Diagnostics;
using System.IO;
using System.Linq;
+using System.Reflection;
using System.Threading;
using System.Web;
using log4net;
@@ -62,12 +63,34 @@ namespace Umbraco.Core.Logging
public void Error(Type callingType, string message, Exception exception)
{
- var logger = LogManager.GetLogger(callingType);
- if (logger != null)
- logger.Error((message), exception);
+ var logger = LogManager.GetLogger(callingType);
+ if (logger == null) return;
+
+ if (IsTimeoutThreadAbortException(exception))
+ {
+ message += "\r\nThe thread has been aborted, because the request has timed out.";
+ }
+
+ logger.Error(message, exception);
}
- public void Warn(Type callingType, string message, params Func