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

Remove Debug<T> from LoggerExtensions

Browse Source
This commit is contained in:
Nikolaj
2020-09-16 10:24:05 +02:00
parent 488093add3
commit a18580c7f6
30 changed files with 90 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
View File

@@ -426,7 +426,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
// assumes xml lock (file is always locked)
private void LoadXmlLocked(SafeXmlReaderWriter safeXml, out bool registerXmlChange)
{
Current.Logger.Debug<XmlStore>("Loading Xml...");
Current.Logger.LogDebug("Loading Xml...");
// try to get it from the file
if (XmlFileEnabled && (safeXml.Xml = LoadXmlFromFile()) != null)
@@ -834,7 +834,7 @@ AND (umbracoNode.id=@id)";
_nextFileCheck = now.AddSeconds(1); // check every 1s
if (XmlFileLastWriteTime <= _lastFileRead) return;
Current.Logger.Debug<XmlStore>("Xml file change detected, reloading.");
Current.Logger.LogDebug("Xml file change detected, reloading.");
// time to read
@@ -1042,7 +1042,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder";
{
foreach (var payload in payloads)
{
Current.Logger.Debug<XmlStore>("Notified {ChangeTypes} for content {ContentId}", payload.ChangeTypes, payload.Id);
Current.Logger.LogDebug("Notified {ChangeTypes} for content {ContentId}", payload.ChangeTypes, payload.Id);
if (payload.ChangeTypes.HasType(TreeChangeTypes.RefreshAll))
{
@@ -1075,7 +1075,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder";
if (content == null || content.Published == false || content.Trashed)
{
// no published version
Current.Logger.Debug<XmlStore>("Notified, content {ContentId} has no published version.", payload.Id);
Current.Logger.LogDebug("Notified, content {ContentId} has no published version.", payload.Id);
if (current != null)
{
@@ -1114,7 +1114,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder";
if (dtos.MoveNext() == false)
{
// gone fishing, remove (possible race condition)
Current.Logger.Debug<XmlStore>("Notified, content {ContentId} gone fishing.", payload.Id);
Current.Logger.LogDebug("Notified, content {ContentId} gone fishing.", payload.Id);
if (current != null)
{
@@ -1228,7 +1228,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder";
.ToArray();
foreach (var payload in payloads)
Current.Logger.Debug<XmlStore>("Notified {ChangeTypes} for content type {ContentTypeId}", payload.ChangeTypes, payload.Id);
Current.Logger.LogDebug("Notified {ChangeTypes} for content type {ContentTypeId}", payload.ChangeTypes, payload.Id);
if (ids.Length > 0) // must have refreshes, not only removes
RefreshContentTypes(ids);
@@ -1247,7 +1247,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder";
_contentTypeCache.ClearDataType(payload.Id);
foreach (var payload in payloads)
Current.Logger.Debug<XmlStore>("Notified {RemovedStatus} for data type {payload.Id}",
Current.Logger.LogDebug("Notified {RemovedStatus} for data type {payload.Id}",
payload.Removed ? "Removed" : "Refreshed",
payload.Id);

20
src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStoreFilePersister.cs
View File

@@ -61,7 +61,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
if (touched == false) return;
_logger.Debug<XmlStoreFilePersister>("Created, save in {WaitMilliseconds}ms.", WaitMilliseconds);
_logger.LogDebug("Created, save in {WaitMilliseconds}ms.", WaitMilliseconds);
_initialTouch = DateTime.Now;
_timer = new Timer(_ => TimerRelease());
_timer.Change(WaitMilliseconds, 0);
@@ -83,22 +83,22 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
{
if (_released) // our timer has triggered OR the runner is shutting down
{
_logger.Debug<XmlStoreFilePersister>("Touched, was released...");
_logger.LogDebug("Touched, was released...");
// release: has run or is running, too late, return a new task (adds itself to runner)
if (_runner == null)
{
_logger.Debug<XmlStoreFilePersister>("Runner is down, run now.");
_logger.LogDebug("Runner is down, run now.");
runNow = true;
}
else
{
_logger.Debug<XmlStoreFilePersister>("Create new...");
_logger.LogDebug("Create new...");
ret = new XmlStoreFilePersister(_runner, _store, _logger, true);
if (ret._runner == null)
{
// could not enlist with the runner, runner is completed, must run now
_logger.Debug<XmlStoreFilePersister>("Runner is down, run now.");
_logger.LogDebug("Runner is down, run now.");
runNow = true;
}
}
@@ -106,7 +106,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
else if (_timer == null) // we don't have a timer yet
{
_logger.Debug<XmlStoreFilePersister>("Touched, was idle, start and save in {WaitMilliseconds}ms.", WaitMilliseconds);
_logger.LogDebug("Touched, was idle, start and save in {WaitMilliseconds}ms.", WaitMilliseconds);
_initialTouch = DateTime.Now;
_timer = new Timer(_ => TimerRelease());
_timer.Change(WaitMilliseconds, 0);
@@ -119,12 +119,12 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
if (DateTime.Now - _initialTouch < TimeSpan.FromMilliseconds(MaxWaitMilliseconds))
{
_logger.Debug<XmlStoreFilePersister>("Touched, was waiting, can delay, save in {WaitMilliseconds}ms.", WaitMilliseconds);
_logger.LogDebug("Touched, was waiting, can delay, save in {WaitMilliseconds}ms.", WaitMilliseconds);
_timer.Change(WaitMilliseconds, 0);
}
else
{
_logger.Debug<XmlStoreFilePersister>("Touched, was waiting, cannot delay.");
_logger.LogDebug("Touched, was waiting, cannot delay.");
}
}
}
@@ -144,7 +144,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
{
lock (_locko)
{
_logger.Debug<XmlStoreFilePersister>("Timer: release.");
_logger.LogDebug("Timer: release.");
_released = true;
Release();
@@ -157,7 +157,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
{
lock (_locko)
{
_logger.Debug<XmlStoreFilePersister>("Run now (sync).");
_logger.LogDebug("Run now (sync).");
// not really needed but safer (it's only us invoking Run, but the method is public...)
_released = true;
}