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

Align namespaces in Logging to Umbraco.Cms.Core

Browse Source 
I'm a bit uncertain about this, they do have a reference to Serilog, but the vast majority of logging already resides in Core, so I opted to move it to Umbraco.Cms.Core
This commit is contained in:
Mole
2021-02-12 11:38:50 +01:00
parent f13a961daa
commit 07d04dafb8
40 changed files with 37 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Umbraco.Infrastructure/Logging/LogHttpRequest.cs
View File

@@ -1,24 +0,0 @@
using System;
using Umbraco.Cms.Core.Cache;
namespace Umbraco.Core.Logging
{
public static class LogHttpRequest
{
static readonly string RequestIdItemName = typeof(LogHttpRequest).Name + "+RequestId";
/// <summary>
/// Retrieve the id assigned to the currently-executing HTTP request, if any.
/// </summary>
/// <param name="requestId">The request id.</param>
/// <param name="requestCache"></param>
/// <returns><c>true</c> if there is a request in progress; <c>false</c> otherwise.</returns>
public static bool TryGetCurrentHttpRequestId(out Guid requestId, IRequestCache requestCache)
{
var requestIdItem = requestCache.Get(RequestIdItemName, () => Guid.NewGuid());
requestId = (Guid)requestIdItem;
return true;
}
}
}

4
src/Umbraco.Infrastructure/Logging/MessageTemplates.cs
View File

@@ -1,13 +1,11 @@
using System;
using System.IO;
using System.Linq;
using System.Text;
using Serilog;
using Serilog.Events;
using Serilog.Parsing;
using Umbraco.Cms.Core.Logging;
namespace Umbraco.Core.Logging
namespace Umbraco.Cms.Core.Logging
{
public class MessageTemplates : IMessageTemplates
{

3
src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpRequestIdEnricher.cs
View File

@@ -2,8 +2,9 @@
using Serilog.Core;
using Serilog.Events;
using Umbraco.Cms.Core.Cache;
using Umbraco.Extensions;
namespace Umbraco.Core.Logging.Serilog.Enrichers
namespace Umbraco.Cms.Core.Logging.Serilog.Enrichers
{
/// <summary>
/// Enrich log events with a HttpRequestId GUID.

2
src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpRequestNumberEnricher.cs
View File

@@ -4,7 +4,7 @@ using Serilog.Core;
using Serilog.Events;
using Umbraco.Cms.Core.Cache;
namespace Umbraco.Core.Logging.Serilog.Enrichers
namespace Umbraco.Cms.Core.Logging.Serilog.Enrichers
{
/// <summary>
/// Enrich log events with a HttpRequestNumber unique within the current

2
src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs
View File

@@ -3,7 +3,7 @@ using Serilog.Events;
using System;
using Umbraco.Cms.Core.Net;
namespace Umbraco.Core.Logging.Serilog.Enrichers
namespace Umbraco.Cms.Core.Logging.Serilog.Enrichers
{
/// <summary>
/// Enrich log events with the HttpSessionId property.

2
src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/Log4NetLevelMapperEnricher.cs
View File

@@ -1,7 +1,7 @@
using Serilog.Core;
using Serilog.Events;
namespace Umbraco.Core.Logging.Serilog.Enrichers
namespace Umbraco.Cms.Core.Logging.Serilog.Enrichers
{
/// <summary>
/// This is used to create a new property in Logs called 'Log4NetLevel'

2
src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/ThreadAbortExceptionEnricher.cs
View File

@@ -8,7 +8,7 @@ using Umbraco.Cms.Core.Diagnostics;
using Umbraco.Cms.Core.Hosting;
using CoreDebugSettings = Umbraco.Cms.Core.Configuration.Models.CoreDebugSettings;
namespace Umbraco.Infrastructure.Logging.Serilog.Enrichers
namespace Umbraco.Cms.Core.Logging.Serilog.Enrichers
{
/// <summary>
/// Enriches the log if there are ThreadAbort exceptions and will automatically create a minidump if it can

5
src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
View File

@@ -8,11 +8,10 @@ using Serilog.Events;
using Serilog.Formatting;
using Serilog.Formatting.Compact;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Logging;
using Umbraco.Core.Logging.Serilog.Enrichers;
using Umbraco.Cms.Core.Logging.Serilog.Enrichers;
using Umbraco.Extensions;
namespace Umbraco.Core.Logging.Serilog
namespace Umbraco.Cms.Core.Logging.Serilog
{
public static class LoggerConfigExtensions
{

5
src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs
View File

@@ -4,13 +4,10 @@ using Microsoft.Extensions.Configuration;
using Serilog;
using Serilog.Events;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Logging;
using Umbraco.Extensions;
using LogLevel = Umbraco.Cms.Core.Logging.LogLevel;
namespace Umbraco.Core.Logging.Serilog
namespace Umbraco.Cms.Core.Logging.Serilog
{
///<summary>
/// Implements <see cref="ILogger"/> on top of Serilog.
///</summary>

2
src/Umbraco.Infrastructure/Logging/Viewer/CountingFilter.cs
View File

@@ -1,7 +1,7 @@
using System;
using Serilog.Events;
namespace Umbraco.Core.Logging.Viewer
namespace Umbraco.Cms.Core.Logging.Viewer
{
internal class CountingFilter : ILogFilter
{

2
src/Umbraco.Infrastructure/Logging/Viewer/ErrorCounterFilter.cs
View File

@@ -1,6 +1,6 @@
using Serilog.Events;
namespace Umbraco.Core.Logging.Viewer
namespace Umbraco.Cms.Core.Logging.Viewer
{
internal class ErrorCounterFilter : ILogFilter
{

2
src/Umbraco.Infrastructure/Logging/Viewer/ExpressionFilter.cs
View File

@@ -4,7 +4,7 @@ using Serilog.Events;
using Serilog.Filters.Expressions;
using Umbraco.Extensions;
namespace Umbraco.Core.Logging.Viewer
namespace Umbraco.Cms.Core.Logging.Viewer
{
//Log Expression Filters (pass in filter exp string)
internal class ExpressionFilter : ILogFilter

2
src/Umbraco.Infrastructure/Logging/Viewer/ILogFilter.cs
View File

@@ -1,6 +1,6 @@
using Serilog.Events;
namespace Umbraco.Core.Logging.Viewer
namespace Umbraco.Cms.Core.Logging.Viewer
{
public interface ILogFilter
{

4
src/Umbraco.Infrastructure/Logging/Viewer/ILogViewer.cs
View File

@@ -1,9 +1,7 @@
using System.Collections.Generic;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;
using Umbraco.Core.Models;
namespace Umbraco.Core.Logging.Viewer
namespace Umbraco.Cms.Core.Logging.Viewer
{
public interface ILogViewer
{

2
src/Umbraco.Infrastructure/Logging/Viewer/ILogViewerConfig.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
namespace Umbraco.Core.Logging.Viewer
namespace Umbraco.Cms.Core.Logging.Viewer
{
public interface ILogViewerConfig
{

2
src/Umbraco.Infrastructure/Logging/Viewer/LogLevelCounts.cs
View File

@@ -1,4 +1,4 @@
namespace Umbraco.Core.Logging.Viewer
namespace Umbraco.Cms.Core.Logging.Viewer
{
public class LogLevelCounts
{

2
src/Umbraco.Infrastructure/Logging/Viewer/LogMessage.cs
View File

@@ -5,7 +5,7 @@ using System;
using System.Collections.Generic;
// ReSharper disable UnusedAutoPropertyAccessor.Global
namespace Umbraco.Core.Logging.Viewer
namespace Umbraco.Cms.Core.Logging.Viewer
{
public class LogMessage
{

2
src/Umbraco.Infrastructure/Logging/Viewer/LogTemplate.cs
View File

@@ -1,4 +1,4 @@
namespace Umbraco.Core.Logging.Viewer
namespace Umbraco.Cms.Core.Logging.Viewer
{
public class LogTemplate
{

2
src/Umbraco.Infrastructure/Logging/Viewer/LogTimePeriod.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace Umbraco.Core.Logging.Viewer
namespace Umbraco.Cms.Core.Logging.Viewer
{
public class LogTimePeriod
{

2
src/Umbraco.Infrastructure/Logging/Viewer/LogViewerComposer.cs
View File

@@ -7,7 +7,7 @@ using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Infrastructure.DependencyInjection;
using Umbraco.Extensions;
namespace Umbraco.Core.Logging.Viewer
namespace Umbraco.Cms.Core.Logging.Viewer
{
// ReSharper disable once UnusedMember.Global
public class LogViewerComposer : ICoreComposer

2
src/Umbraco.Infrastructure/Logging/Viewer/LogViewerConfig.cs
View File

@@ -6,7 +6,7 @@ using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Routing;
using Formatting = Newtonsoft.Json.Formatting;
namespace Umbraco.Core.Logging.Viewer
namespace Umbraco.Cms.Core.Logging.Viewer
{
public class LogViewerConfig : ILogViewerConfig
{

2
src/Umbraco.Infrastructure/Logging/Viewer/MessageTemplateFilter.cs
View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using Serilog.Events;
namespace Umbraco.Core.Logging.Viewer
namespace Umbraco.Cms.Core.Logging.Viewer
{
internal class MessageTemplateFilter : ILogFilter
{

2
src/Umbraco.Infrastructure/Logging/Viewer/SavedLogSearch.cs
View File

@@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace Umbraco.Core.Logging.Viewer
namespace Umbraco.Cms.Core.Logging.Viewer
{
public class SavedLogSearch
{

2
src/Umbraco.Infrastructure/Logging/Viewer/SerilogJsonLogViewer.cs
View File

@@ -8,7 +8,7 @@ using Serilog.Events;
using Serilog.Formatting.Compact.Reader;
using Umbraco.Cms.Core.Logging;
namespace Umbraco.Core.Logging.Viewer
namespace Umbraco.Cms.Core.Logging.Viewer
{
internal class SerilogJsonLogViewer : SerilogLogViewerSourceBase
{

3
src/Umbraco.Infrastructure/Logging/Viewer/SerilogLogViewerSourceBase.cs
View File

@@ -2,11 +2,10 @@
using System.Collections.Generic;
using System.Linq;
using Serilog.Events;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;
using Umbraco.Extensions;
namespace Umbraco.Core.Logging.Viewer
namespace Umbraco.Cms.Core.Logging.Viewer
{
public abstract class SerilogLogViewerSourceBase : ILogViewer
{