yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored the error params, so that exception is before the message/template so its more in sync with Serilog signature & was an easy way to find some more logs I missed too

Browse Source
This commit is contained in:
Warren
2018-08-17 15:41:58 +01:00
parent 38984181fc
commit 9e996c68bb
98 changed files with 219 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
View File

@@ -387,9 +387,9 @@ namespace Umbraco.Web.Scheduling
{
await RunAsync(bgTask, _cancelTokenSource.Token).ConfigureAwait(false);
}
catch (Exception e)
catch (Exception ex)
{
_logger.Error<BackgroundTaskRunner>("{LogPrefix} Task runner exception", e, _logPrefix);
_logger.Error<BackgroundTaskRunner>(ex, "{LogPrefix} Task runner exception", _logPrefix);
}
// done
@@ -537,7 +537,7 @@ namespace Umbraco.Web.Scheduling
catch (Exception ex)
{
_logger.Error<BackgroundTaskRunner>("{LogPrefix} Task has failed", ex, _logPrefix);
_logger.Error<BackgroundTaskRunner>(ex, "{LogPrefix} Task has failed", _logPrefix);
}
}
@@ -580,7 +580,7 @@ namespace Umbraco.Web.Scheduling
}
catch (Exception ex)
{
_logger.Error<BackgroundTaskRunner>(_logPrefix + name + " exception occurred", ex);
_logger.Error<BackgroundTaskRunner>(ex, "{LogPrefix} {Name} exception occurred", _logPrefix, name);
}
}

4
src/Umbraco.Web/Scheduling/KeepAlive.cs
View File

@@ -63,9 +63,9 @@ namespace Umbraco.Web.Scheduling
var result = await wc.SendAsync(request, token);
}
}
catch (Exception e)
catch (Exception ex)
{
_logger.Error<KeepAlive>(string.Format("Failed (at \"{0}\").", umbracoAppUrl), e);
_logger.Error<KeepAlive>(ex, "Failed (at '{UmbracoAppUrl}').", umbracoAppUrl);
}
}

8
src/Umbraco.Web/Scheduling/LogScrubber.cs
View File

@@ -41,9 +41,9 @@ namespace Umbraco.Web.Scheduling
if (settings.Logging.MaxLogAge > -1)
maximumAge = settings.Logging.MaxLogAge;
}
catch (Exception e)
catch (Exception ex)
{
_logger.Error<LogScrubber>("Unable to locate a log scrubbing maximum age. Defaulting to 24 hours.", e);
_logger.Error<LogScrubber>(ex, "Unable to locate a log scrubbing maximum age. Defaulting to 24 hours.");
}
return maximumAge;
@@ -57,9 +57,9 @@ namespace Umbraco.Web.Scheduling
if (settings.Logging.CleaningMiliseconds > -1)
interval = settings.Logging.CleaningMiliseconds;
}
catch (Exception e)
catch (Exception ex)
{
logger.Error<LogScrubber>("Unable to locate a log scrubbing interval. Defaulting to 4 hours.", e);
logger.Error<LogScrubber>(ex, "Unable to locate a log scrubbing interval. Defaulting to 4 hours.");
}
return interval;
}

4
src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
View File

@@ -62,9 +62,9 @@ namespace Umbraco.Web.Scheduling
var publisher = new ScheduledPublisher(_contentService, _logger, _userService);
var count = publisher.CheckPendingAndProcess();
}
catch (Exception e)
catch (Exception ex)
{
_logger.Error<ScheduledPublishing>("Failed.", e);
_logger.Error<ScheduledPublishing>(ex, "Failed.");
}
return true; // repeat

6
src/Umbraco.Web/Scheduling/ScheduledTasks.cs
View File

@@ -82,7 +82,7 @@ namespace Umbraco.Web.Scheduling
}
catch (Exception ex)
{
_logger.Error<ScheduledTasks>("An error occurred calling web task for url: " + url, ex);
_logger.Error<ScheduledTasks>(ex, "An error occurred calling web task for url: {Url}", url);
}
return false;
}
@@ -113,9 +113,9 @@ namespace Umbraco.Web.Scheduling
{
await ProcessTasksAsync(token);
}
catch (Exception ee)
catch (Exception ex)
{
_logger.Error<ScheduledTasks>("Error executing scheduled task", ee);
_logger.Error<ScheduledTasks>(ex, "Error executing scheduled task");
}
}