alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-15 14:52:20 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Do not call UseContentRoot() on the web host builder

Browse Source 
This call has nothing to do with static web content and should not have ever been called with the web content path: https://docs.microsoft.com/en-us/aspnet/core/fundamentals/?view=aspnetcore-3.1&tabs=windows#content-root
Since this call is removed, the ContentRoot property is also removed from ApplicationHost as it is no longer needed.
Finally, move validation of the static content path to the DashboardService where it is actually used.
This commit is contained in:
Mark Monteiro
2020-03-15 17:42:57 +01:00
parent 602112fba4
commit 05ab61200a
5 changed files with 20 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Jellyfin.Server/Program.cs
View File

@@ -243,7 +243,7 @@ namespace Jellyfin.Server
IConfiguration startupConfig,
IApplicationPaths appPaths)
{
var webhostBuilder = new WebHostBuilder()
return new WebHostBuilder()
.UseKestrel(options =>
{
var addresses = appHost.ServerConfigurationManager
@@ -289,24 +289,6 @@ namespace Jellyfin.Server
services.TryAdd(serviceCollection);
})
.UseStartup<Startup>();
// Set up static content hosting unless it has been disabled via config
if (!startupConfig.NoWebContent())
{
// Fail startup if the web content does not exist
if (!Directory.Exists(appHost.ContentRoot) || !Directory.GetFiles(appHost.ContentRoot).Any())
{
throw new InvalidOperationException(
"The server is expected to host web content, but the provided content directory is either " +
$"invalid or empty: {appHost.ContentRoot}. If you do not want to host web content with the " +
$"server, you may set the '{MediaBrowser.Controller.Extensions.ConfigurationExtensions.NoWebContentKey}' flag.");
}
// Configure the web host to host the static web content
webhostBuilder.UseContentRoot(appHost.ContentRoot);
}
return webhostBuilder;
}
/// <summary>