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

Use MS ILogger in database stuff

Browse Source
This commit is contained in:
Nikolaj
2020-09-17 12:52:25 +02:00
parent 4b254a02a8
commit c89659c597
14 changed files with 93 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
View File

@@ -8,9 +8,9 @@ using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Threading;
using Microsoft.Extensions.Logging;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.Logging;
using Umbraco.Core.Migrations.Install;
using Umbraco.Core.Persistence;
@@ -24,7 +24,7 @@ namespace Umbraco.Tests.Integration.Testing
public const string InstanceName = "UmbracoTests";
public const string DatabaseName = "UmbracoTests";
private readonly ILogger _logger;
private readonly ILoggerFactory _loggerFactory;
private readonly IGlobalSettings _globalSettings;
private readonly LocalDb _localDb;
private readonly IUmbracoVersion _umbracoVersion;
@@ -38,10 +38,10 @@ namespace Umbraco.Tests.Integration.Testing
private DatabasePool _currentPool;
//It's internal because `Umbraco.Core.Persistence.LocalDb` is internal
internal LocalDbTestDatabase(ILogger logger, IGlobalSettings globalSettings, LocalDb localDb, string filesPath, IUmbracoDatabaseFactory dbFactory)
internal LocalDbTestDatabase(ILoggerFactory loggerFactory, IGlobalSettings globalSettings, LocalDb localDb, string filesPath, IUmbracoDatabaseFactory dbFactory)
{
_umbracoVersion = new UmbracoVersion();
_logger = logger;
_loggerFactory = loggerFactory;
_globalSettings = globalSettings;
_localDb = localDb;
_filesPath = filesPath;
@@ -130,7 +130,7 @@ namespace Umbraco.Tests.Integration.Testing
using var trans = database.GetTransaction();
var creator = new DatabaseSchemaCreator(database, _logger, _umbracoVersion, _globalSettings);
var creator = new DatabaseSchemaCreator(database, _loggerFactory.CreateLogger<DatabaseSchemaCreator>(), _loggerFactory, _umbracoVersion, _globalSettings);
creator.InitializeDatabaseSchema();
trans.Complete(); // commit it