Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-20 20:50:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1644 from Bond-009/hiddenwarn

Browse source 
Fix possible hidden exceptions
This commit is contained in:
dkanada 2019-08-19 01:59:07 -07:00 committed by GitHub
parent 5626709de5 99aea27723
commit c8474f734c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Jellyfin.Server/Program.cs
View file

@ -150,14 +150,15 @@ namespace Jellyfin.Server
_logger.LogWarning("Failed to enable shared cache for SQLite"); _logger.LogWarning("Failed to enable shared cache for SQLite");
} }
using (var appHost = new CoreAppHost( var appHost = new CoreAppHost(
appPaths, appPaths,
_loggerFactory, _loggerFactory,
options, options,
new ManagedFileSystem(_loggerFactory.CreateLogger<ManagedFileSystem>(), appPaths), new ManagedFileSystem(_loggerFactory.CreateLogger<ManagedFileSystem>(), appPaths),
new NullImageEncoder(), new NullImageEncoder(),
new NetworkManager(_loggerFactory.CreateLogger<NetworkManager>()), new NetworkManager(_loggerFactory.CreateLogger<NetworkManager>()),
appConfig)) appConfig);
try
{ {
await appHost.InitAsync(new ServiceCollection()).ConfigureAwait(false); await appHost.InitAsync(new ServiceCollection()).ConfigureAwait(false);
@ -165,15 +166,20 @@ namespace Jellyfin.Server
await appHost.RunStartupTasksAsync().ConfigureAwait(false); await appHost.RunStartupTasksAsync().ConfigureAwait(false);
try // Block main thread until shutdown
{ await Task.Delay(-1, _tokenSource.Token).ConfigureAwait(false);
// Block main thread until shutdown }
await Task.Delay(-1, _tokenSource.Token).ConfigureAwait(false); catch (TaskCanceledException)
} {
catch (TaskCanceledException) // Don't throw on cancellation
{ }
// Don't throw on cancellation catch (Exception ex)
} {
_logger.LogCritical(ex, "Error while starting server.");
}
finally
{
appHost?.Dispose();
} }
if (_restartOnShutdown) if (_restartOnShutdown)