Examine 2.0 integration (#10241)
* Init commit for examine 2.0 work, most old umb examine tests working, probably a lot that doesn't * Gets Umbraco Examine tests passing and makes some sense out of them, fixes some underlying issues. * Large refactor, remove TaskHelper, rename Notifications to be consistent, Gets all examine/lucene indexes building and startup ordered in the correct way, removes old files, creates new IUmbracoIndexingHandler for abstracting out all index operations for umbraco data, abstracts out IIndexRebuilder, Fixes Stack overflow with LiveModelsProvider and loading assemblies, ports some changes from v8 for startup handling with cold boots, refactors out LastSyncedFileManager * fix up issues with rebuilding and management dashboard. * removes old files, removes NetworkHelper, fixes LastSyncedFileManager implementation to ensure the machine name is used, fix up logging with cold boot state. * Makes MainDom safer to use and makes PublishedSnapshotService lazily register with MainDom * lazily acquire application id (fix unit tests) * Fixes resource casing and missing test file * Ensures caches when requiring internal services for PublishedSnapshotService, UseNuCache is a separate call, shouldn't be buried in AddWebComponents, was also causing issues in integration tests since nucache was being used for the Id2Key service. * For UmbracoTestServerTestBase enable nucache services * Fixing tests * Fix another test * Fixes tests, use TestHostingEnvironment, make Tests.Common use net5, remove old Lucene.Net.Contrib ref. * Fixes up some review notes * Fixes issue with doubly registering PublishedSnapshotService meanig there could be 2x instances of it * Checks for parseexception when executing the query * Use application root instead of duplicating functionality. * Added Examine project to netcore only solution file * Fixed casing issue with LazyLoad, that is not lowercase. * uses cancellationToken instead of bool flag, fixes always reading lastId from the LastSyncedFileManager, fixes RecurringHostedServiceBase so that there isn't an overlapping thread for the same task type * Fix tests * remove legacy test project from solution file * Fix test Co-authored-by: Bjarke Berg <mail@bergmania.dk>
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using Microsoft.AspNetCore.DataProtection;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Umbraco.Cms.Core.Configuration;
|
||||
@@ -13,23 +14,25 @@ namespace Umbraco.Cms.Web.Common.AspNetCore
|
||||
public class AspNetCoreHostingEnvironment : IHostingEnvironment
|
||||
{
|
||||
private readonly ISet<Uri> _applicationUrls = new HashSet<Uri>();
|
||||
private readonly IServiceProvider _serviceProvider;
|
||||
private readonly IOptionsMonitor<HostingSettings> _hostingSettings;
|
||||
private readonly IOptionsMonitor<WebRoutingSettings> _webRoutingSettings;
|
||||
private readonly IWebHostEnvironment _webHostEnvironment;
|
||||
|
||||
private string _applicationId;
|
||||
private string _localTempPath;
|
||||
|
||||
public AspNetCoreHostingEnvironment(
|
||||
IServiceProvider serviceProvider,
|
||||
IOptionsMonitor<HostingSettings> hostingSettings,
|
||||
IOptionsMonitor<WebRoutingSettings> webRoutingSettings,
|
||||
IWebHostEnvironment webHostEnvironment)
|
||||
{
|
||||
_serviceProvider = serviceProvider;
|
||||
_hostingSettings = hostingSettings ?? throw new ArgumentNullException(nameof(hostingSettings));
|
||||
_webRoutingSettings = webRoutingSettings ?? throw new ArgumentNullException(nameof(webRoutingSettings));
|
||||
_webHostEnvironment = webHostEnvironment ?? throw new ArgumentNullException(nameof(webHostEnvironment));
|
||||
|
||||
SiteName = webHostEnvironment.ApplicationName;
|
||||
ApplicationId = AppDomain.CurrentDomain.Id.ToString();
|
||||
ApplicationPhysicalPath = webHostEnvironment.ContentRootPath;
|
||||
}
|
||||
|
||||
@@ -43,7 +46,29 @@ namespace Umbraco.Cms.Web.Common.AspNetCore
|
||||
public string SiteName { get; }
|
||||
|
||||
/// <inheritdoc/>
|
||||
public string ApplicationId { get; }
|
||||
public string ApplicationId
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_applicationId != null)
|
||||
{
|
||||
return _applicationId;
|
||||
}
|
||||
|
||||
var appId = _serviceProvider.GetApplicationUniqueIdentifier();
|
||||
if (appId == null)
|
||||
{
|
||||
throw new InvalidOperationException("Could not acquire an ApplicationId, ensure DataProtection services and an IHostEnvironment are registered");
|
||||
}
|
||||
|
||||
// Hash this value because it can really be anything. By default this will be the application's path.
|
||||
// TODO: Test on IIS, hopefully this would be equivalent to the IIS unique ID.
|
||||
// This could also contain sensitive information (i.e. like the physical path) which we don't want to expose in logs.
|
||||
_applicationId = appId.GenerateHash();
|
||||
|
||||
return _applicationId;
|
||||
}
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public string ApplicationPhysicalPath { get; }
|
||||
|
||||
Reference in New Issue
Block a user