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

Merge branch temp8 into temp8-di2690

Browse Source
This commit is contained in:
Stephan
2018-12-18 15:42:45 +01:00
parent 813eccdc5a 61fd924675
commit 115b0cd2aa
136 changed files with 3339 additions and 3147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web/Search/ExamineComponent.cs
View File

@@ -208,23 +208,7 @@ namespace Umbraco.Web.Search
if (_isConfigured) return;
_isConfigured = true;
foreach (var luceneIndexer in examineManager.Indexes.OfType<LuceneIndex>())
{
//We now need to disable waiting for indexing for Examine so that the appdomain is shutdown immediately and doesn't wait for pending
//indexing operations. We used to wait for indexing operations to complete but this can cause more problems than that is worth because
//that could end up halting shutdown for a very long time causing overlapping appdomains and many other problems.
luceneIndexer.WaitForIndexQueueOnShutdown = false;
//we should check if the index is locked ... it shouldn't be! We are using simple fs lock now and we are also ensuring that
//the indexes are not operational unless MainDom is true
var dir = luceneIndexer.GetLuceneDirectory();
if (IndexWriter.IsLocked(dir))
{
logger.Info<ExamineComponent>("Forcing index {IndexerName} to be unlocked since it was left in a locked state", luceneIndexer.Name);
IndexWriter.Unlock(dir);
}
}
examineManager.UnlockLuceneIndexes(logger);
}
}