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

Merge branch 'v11/dev' into v11/contrib

Browse Source
This commit is contained in:
Sebastiaan Janssen
2022-12-12 13:59:03 +01:00
parent 105670dcc1 311c11074f
commit 5c993ea3c6
116 changed files with 1609 additions and 776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web.Common/Extensions/ServiceCollectionExtensions.cs
View File

@@ -82,8 +82,9 @@ public static class ServiceCollectionExtensions
IHostEnvironment hostEnvironment,
IConfiguration configuration)
{
// TODO: WEBSITE_RUN_FROM_PACKAGE - can't assume this DIR is writable - we have an IConfiguration instance so a later refactor should be easy enough.
var loggingDir = hostEnvironment.MapPathContentRoot(Constants.SystemDirectories.LogFiles);
LoggingSettings loggerSettings = GetLoggerSettings(configuration);
var loggingDir = loggerSettings.GetAbsoluteLoggingPath(hostEnvironment);
ILoggingConfiguration loggingConfig = new LoggingConfiguration(loggingDir);
var umbracoFileConfiguration = new UmbracoFileConfiguration(configuration);
@@ -153,6 +154,13 @@ public static class ServiceCollectionExtensions
return services;
}
private static LoggingSettings GetLoggerSettings(IConfiguration configuration)
{
var loggerSettings = new LoggingSettings();
configuration.GetSection(Constants.Configuration.ConfigLogging).Bind(loggerSettings);
return loggerSettings;
}
/// <summary>
/// Called to create the <see cref="TypeLoader" /> to assign to the <see cref="IUmbracoBuilder" />
/// </summary>