浏览代码

Fix possible hidden exceptions

If an error occurred while starting the server which in turn caused an
exception in the dispose method of the apphost, the first exception
wouldn't get logged.
Bond_009 5 年之前
父节点
当前提交
99aea27723
共有 1 个文件被更改,包括 17 次插入11 次删除
  1. 17 11
      Jellyfin.Server/Program.cs

+ 17 - 11
Jellyfin.Server/Program.cs

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