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

Merge branch 'netcore/dev' into bug/use-sql-main-dom-lock-when-linux

Browse Source
This commit is contained in:
Bjarke Berg
2020-06-25 11:39:11 +02:00
committed by GitHub
parent df2d1fb4da 6d30f31134
commit ba38055ee9
128 changed files with 2166 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
View File

@@ -176,9 +176,10 @@ namespace Umbraco.Web.Common.Extensions
var globalSettings = configs.Global();
var connStrings = configs.ConnectionStrings();
var appSettingMainDomLock = globalSettings.MainDomLock;
var isLinux = RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
var mainDomLock = appSettingMainDomLock == "SqlMainDomLock" || isLinux == true
? (IMainDomLock)new SqlMainDomLock(logger, globalSettings, connStrings, dbProviderFactoryCreator)
? (IMainDomLock)new SqlMainDomLock(logger, globalSettings, connStrings, dbProviderFactoryCreator, hostingEnvironment)
: new MainDomSemaphoreLock(logger, hostingEnvironment);
var mainDom = new MainDom(logger, mainDomLock);