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

Use ILoggerFactory for examine stuff

Browse Source
This commit is contained in:
Nikolaj
2020-09-15 13:00:59 +02:00
parent 0238d6eb02
commit 44848e567c
6 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs
View File

@@ -7,6 +7,8 @@ using Umbraco.Core.IO;
using System.Linq;
using Umbraco.Core.Composing;
using Umbraco.Core.Hosting;
using Microsoft.Extensions.Logging;
using ILogger = Microsoft.Extensions.Logging.ILogger;
namespace Umbraco.Examine
{
@@ -14,7 +16,7 @@ namespace Umbraco.Examine
{
private readonly IHostingEnvironment _hostingEnvironment;
public LuceneIndexDiagnostics(LuceneIndex index, ILogger<LuceneIndexDiagnostics> logger, IHostingEnvironment hostingEnvironment)
public LuceneIndexDiagnostics(LuceneIndex index, ILogger logger, IHostingEnvironment hostingEnvironment)
{
_hostingEnvironment = hostingEnvironment;
Index = index;
@@ -22,7 +24,7 @@ namespace Umbraco.Examine
}
public LuceneIndex Index { get; }
public ILogger<LuceneIndexDiagnostics> Logger { get; }
public ILogger Logger { get; }
public int DocumentCount
{

15
src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs
View File

@@ -13,6 +13,8 @@ using Umbraco.Core.Logging;
using Examine.LuceneEngine;
using Umbraco.Core.Hosting;
using Umbraco.Core.IO;
using Microsoft.Extensions.Logging;
using ILogger = Microsoft.Extensions.Logging.ILogger;
namespace Umbraco.Examine
{
@@ -21,7 +23,7 @@ namespace Umbraco.Examine
/// </summary>
public class UmbracoContentIndex : UmbracoExamineIndex, IUmbracoContentIndex, IDisposable
{
private readonly ILogger<UmbracoContentIndex> _logger;
private readonly ILogger _logger;
protected ILocalizationService LanguageService { get; }
#region Constructors
@@ -35,6 +37,7 @@ namespace Umbraco.Examine
/// <param name="defaultAnalyzer"></param>
/// <param name="profilingLogger"></param>
/// <param name="logger"></param>
/// <param name="loggerFactory"></param>
/// <param name="hostingEnvironment"></param>
/// <param name="runtimeState"></param>
/// <param name="languageService"></param>
@@ -46,15 +49,14 @@ namespace Umbraco.Examine
FieldDefinitionCollection fieldDefinitions,
Analyzer defaultAnalyzer,
IProfilingLogger profilingLogger,
ILogger<UmbracoContentIndex> logger,
ILogger<UmbracoExamineIndex> examineIndexLogger,
ILogger<UmbracoExamineIndexDiagnostics> examineIndexDiagnosticsLogger,
ILogger logger,
ILoggerFactory loggerFactory,
IHostingEnvironment hostingEnvironment,
IRuntimeState runtimeState,
ILocalizationService languageService,
IContentValueSetValidator validator,
IReadOnlyDictionary<string, IFieldValueTypeFactory> indexValueTypes = null)
: base(name, luceneDirectory, fieldDefinitions, defaultAnalyzer, profilingLogger, examineIndexLogger, examineIndexDiagnosticsLogger ,hostingEnvironment, runtimeState, validator, indexValueTypes)
: base(name, luceneDirectory, fieldDefinitions, defaultAnalyzer, profilingLogger, logger, loggerFactory ,hostingEnvironment, runtimeState, validator, indexValueTypes)
{
if (validator == null) throw new ArgumentNullException(nameof(validator));
_logger = logger;
@@ -144,7 +146,8 @@ namespace Umbraco.Examine
var filtered = c.NativeQuery(rawQuery);
var results = filtered.Execute();
_logger.LogDebug("DeleteFromIndex with query: {Query} (found {TotalItems} results)", rawQuery, results.TotalItemCount);
_logger.
LogDebug("DeleteFromIndex with query: {Query} (found {TotalItems} results)", rawQuery, results.TotalItemCount);
//need to queue a delete item for each one found
QueueIndexOperation(results.Select(r => new IndexOperation(new ValueSet(r.Id), IndexOperationType.Delete)));

17
src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs
View File

@@ -13,6 +13,8 @@ using Umbraco.Core.Hosting;
using Umbraco.Core.IO;
using Umbraco.Core.Logging;
using Directory = Lucene.Net.Store.Directory;
using Microsoft.Extensions.Logging;
using ILogger = Microsoft.Extensions.Logging.ILogger;
namespace Umbraco.Examine
{
@@ -22,7 +24,8 @@ namespace Umbraco.Examine
/// </summary>
public abstract class UmbracoExamineIndex : LuceneIndex, IUmbracoIndex, IIndexDiagnostics
{
private readonly ILogger<UmbracoExamineIndex> _logger;
private readonly ILogger _logger;
private readonly ILoggerFactory _loggerFactory;
private readonly IRuntimeState _runtimeState;
// note
@@ -40,7 +43,8 @@ namespace Umbraco.Examine
/// <param name="luceneDirectory"></param>
/// <param name="defaultAnalyzer"></param>
/// <param name="profilingLogger"></param>
/// <param name="_logger"></param>
/// <param name="logger"></param>
/// <param name="loggerFactory"></param>
/// <param name="hostingEnvironment"></param>
/// <param name="runtimeState"></param>
/// <param name="validator"></param>
@@ -51,15 +55,16 @@ namespace Umbraco.Examine
FieldDefinitionCollection fieldDefinitions,
Analyzer defaultAnalyzer,
IProfilingLogger profilingLogger,
ILogger<UmbracoExamineIndex> _logger,
ILogger<UmbracoExamineIndexDiagnostics> _examineIndexLogger,
ILogger logger,
ILoggerFactory loggerFactory,
IHostingEnvironment hostingEnvironment,
IRuntimeState runtimeState,
IValueSetValidator validator = null,
IReadOnlyDictionary<string, IFieldValueTypeFactory> indexValueTypes = null)
: base(name, luceneDirectory, fieldDefinitions, defaultAnalyzer, validator, indexValueTypes)
{
this._logger = _logger;
_logger = logger;
_loggerFactory = loggerFactory;
_runtimeState = runtimeState;
ProfilingLogger = profilingLogger ?? throw new ArgumentNullException(nameof(profilingLogger));
@@ -67,7 +72,7 @@ namespace Umbraco.Examine
if (luceneDirectory is FSDirectory fsDir)
LuceneIndexFolder = fsDir.Directory;
_diagnostics = new UmbracoExamineIndexDiagnostics(this, _examineIndexLogger, hostingEnvironment);
_diagnostics = new UmbracoExamineIndexDiagnostics(this, _loggerFactory.CreateLogger("UmbracoExamineIndexDiagnostics"), hostingEnvironment);
}
private readonly bool _configBased = false;

4
src/Umbraco.Examine.Lucene/UmbracoExamineIndexDiagnostics.cs
View File

@@ -5,6 +5,8 @@ using Umbraco.Core;
using Umbraco.Core.Hosting;
using Umbraco.Core.IO;
using Umbraco.Core.Logging;
using Microsoft.Extensions.Logging;
using ILogger = Microsoft.Extensions.Logging.ILogger;
namespace Umbraco.Examine
{
@@ -12,7 +14,7 @@ namespace Umbraco.Examine
{
private readonly UmbracoExamineIndex _index;
public UmbracoExamineIndexDiagnostics(UmbracoExamineIndex index, ILogger<UmbracoExamineIndexDiagnostics> logger, IHostingEnvironment hostingEnvironment)
public UmbracoExamineIndexDiagnostics(UmbracoExamineIndex index, ILogger logger, IHostingEnvironment hostingEnvironment)
: base(index, logger, hostingEnvironment)
{
_index = index;

27
src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs
View File

@@ -9,6 +9,8 @@ using Umbraco.Core;
using Umbraco.Core.Composing;
using Umbraco.Core.Hosting;
using Umbraco.Core.IO;
using Microsoft.Extensions.Logging;
using ILogger = Microsoft.Extensions.Logging.ILogger;
namespace Umbraco.Examine
{
@@ -23,8 +25,7 @@ namespace Umbraco.Examine
public UmbracoIndexesCreator(
ITypeFinder typeFinder,
IProfilingLogger profilingLogger,
ILogger<UmbracoContentIndex> contentIndexLogger, ILogger<UmbracoExamineIndex> examineIndexLogger,
ILogger<UmbracoExamineIndexDiagnostics> examineIndexDiagnosticsLogger,
ILoggerFactory loggerFactory,
ILocalizationService languageService,
IPublicAccessService publicAccessService,
IMemberService memberService,
@@ -35,9 +36,7 @@ namespace Umbraco.Examine
ILuceneDirectoryFactory directoryFactory) : base(typeFinder, hostingEnvironment, settings)
{
ProfilingLogger = profilingLogger ?? throw new System.ArgumentNullException(nameof(profilingLogger));
ContentIndexLogger = contentIndexLogger;
ExamineIndexLogger = examineIndexLogger;
ExamineIndexDiagnosticsLogger = examineIndexDiagnosticsLogger;
LoggerFactory = loggerFactory;
LanguageService = languageService ?? throw new System.ArgumentNullException(nameof(languageService));
PublicAccessService = publicAccessService ?? throw new System.ArgumentNullException(nameof(publicAccessService));
MemberService = memberService ?? throw new System.ArgumentNullException(nameof(memberService));
@@ -48,9 +47,7 @@ namespace Umbraco.Examine
}
protected IProfilingLogger ProfilingLogger { get; }
protected ILogger<UmbracoContentIndex> ContentIndexLogger { get; }
protected ILogger<UmbracoExamineIndex> ExamineIndexLogger { get; }
protected ILogger<UmbracoExamineIndexDiagnostics> ExamineIndexDiagnosticsLogger { get; }
protected ILoggerFactory LoggerFactory { get; }
protected IHostingEnvironment HostingEnvironment { get; }
protected IRuntimeState RuntimeState { get; }
protected ILuceneDirectoryFactory DirectoryFactory { get; }
@@ -81,9 +78,8 @@ namespace Umbraco.Examine
new UmbracoFieldDefinitionCollection(),
new CultureInvariantWhitespaceAnalyzer(),
ProfilingLogger,
ContentIndexLogger,
ExamineIndexLogger,
ExamineIndexDiagnosticsLogger,
LoggerFactory.CreateLogger("UmbracoContentIndex"),
LoggerFactory,
HostingEnvironment,
RuntimeState,
LanguageService,
@@ -100,9 +96,8 @@ namespace Umbraco.Examine
new UmbracoFieldDefinitionCollection(),
new StandardAnalyzer(Lucene.Net.Util.Version.LUCENE_30),
ProfilingLogger,
ContentIndexLogger,
ExamineIndexLogger,
ExamineIndexDiagnosticsLogger,
LoggerFactory.CreateLogger("UmbracoContentIndex"),
LoggerFactory,
HostingEnvironment,
RuntimeState,
LanguageService,
@@ -118,8 +113,8 @@ namespace Umbraco.Examine
DirectoryFactory.CreateDirectory(Constants.UmbracoIndexes.MembersIndexPath),
new CultureInvariantWhitespaceAnalyzer(),
ProfilingLogger,
ExamineIndexLogger,
ExamineIndexDiagnosticsLogger,
LoggerFactory.CreateLogger("UmbracoContentIndex"),
LoggerFactory,
HostingEnvironment,
RuntimeState,
UmbracoIndexConfig.GetMemberValueSetValidator()

8
src/Umbraco.Examine.Lucene/UmbracoMemberIndex.cs
View File

@@ -1,10 +1,12 @@
using Examine;
using Lucene.Net.Analysis;
using Microsoft.Extensions.Logging;
using Umbraco.Core;
using Umbraco.Core.Hosting;
using Umbraco.Core.IO;
using Umbraco.Core.Logging;
using Directory = Lucene.Net.Store.Directory;
using ILogger = Microsoft.Extensions.Logging.ILogger;
namespace Umbraco.Examine
{
@@ -31,12 +33,12 @@ namespace Umbraco.Examine
Directory luceneDirectory,
Analyzer analyzer,
IProfilingLogger profilingLogger,
ILogger<UmbracoExamineIndex> indexLogger,
ILogger<UmbracoExamineIndexDiagnostics> indexDiagnosticsLogger,
ILogger logger,
ILoggerFactory loggerFactory,
IHostingEnvironment hostingEnvironment,
IRuntimeState runtimeState,
IValueSetValidator validator = null) :
base(name, luceneDirectory, fieldDefinitions, analyzer, profilingLogger, indexLogger, indexDiagnosticsLogger, hostingEnvironment, runtimeState, validator)
base(name, luceneDirectory, fieldDefinitions, analyzer, profilingLogger, logger, loggerFactory, hostingEnvironment, runtimeState, validator)
{
}