lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dispose image magick environment on shutdown

Browse Source
This commit is contained in:
Luke Pulverenti 2015-02-22 00:45:29 -05:00
parent baed94cee6
commit a0c6c259e6
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@ -203,8 +203,6 @@ namespace MediaBrowser.Model.Configuration
public bool EnableAudioArchiveFiles { get; set; } public bool EnableAudioArchiveFiles { get; set; }
public bool EnableVideoArchiveFiles { get; set; } public bool EnableVideoArchiveFiles { get; set; }
public bool EnableLegacyCollectionInView { get; set; }
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="ServerConfiguration" /> class. /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
/// </summary> /// </summary>

1
MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs
View File

@ -822,6 +822,7 @@ namespace MediaBrowser.Server.Implementations.Drawing
public void Dispose() public void Dispose()
{ {
Wand.CloseEnvironment();
_saveImageSizeTimer.Dispose(); _saveImageSizeTimer.Dispose();
} }
} }

3
MediaBrowser.Server.Implementations/Library/UserViewManager.cs
View File

@ -85,8 +85,7 @@ namespace MediaBrowser.Server.Implementations.Library
list.Add(await GetUserView(CollectionType.Movies, string.Empty, cancellationToken).ConfigureAwait(false)); list.Add(await GetUserView(CollectionType.Movies, string.Empty, cancellationToken).ConfigureAwait(false));
} }
if (foldersWithViewTypes.Any(i => string.Equals(i.CollectionType, CollectionType.Games, StringComparison.OrdinalIgnoreCase)) if (foldersWithViewTypes.Any(i => string.Equals(i.CollectionType, CollectionType.Games, StringComparison.OrdinalIgnoreCase)))
|| _config.Configuration.EnableLegacyCollectionInView)
{ {
list.Add(await GetUserView(CollectionType.Games, string.Empty, cancellationToken).ConfigureAwait(false)); list.Add(await GetUserView(CollectionType.Games, string.Empty, cancellationToken).ConfigureAwait(false));
} }

2
MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
View File

@ -69,7 +69,7 @@
"ButtonAddToCollection": "Add to collection", "ButtonAddToCollection": "Add to collection",
"HeaderSelectCertificatePath": "Select Certificate Path", "HeaderSelectCertificatePath": "Select Certificate Path",
"ConfirmMessageScheduledTaskButton": "This operation normally runs automatically as a scheduled task. It can also be run manually here. To configure the scheduled task, see:", "ConfirmMessageScheduledTaskButton": "This operation normally runs automatically as a scheduled task. It can also be run manually here. To configure the scheduled task, see:",
"HeaderSupporterBenefit": "A supporter membership provides additional benefits such as access to premium plugins, internet channel content, and more. {0}Learn more{1}.", "HeaderSupporterBenefit": "A supporter membership provides additional benefits such as access to sync, premium plugins, internet channel content, and more. {0}Learn more{1}.",
"LabelSyncNoTargetsHelp": "It looks like you don't currently have any apps that support sync.", "LabelSyncNoTargetsHelp": "It looks like you don't currently have any apps that support sync.",
"HeaderWelcomeToMediaBrowserServerDashboard": "Welcome to the Media Browser Dashboard", "HeaderWelcomeToMediaBrowserServerDashboard": "Welcome to the Media Browser Dashboard",
"HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client", "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",

5
MediaBrowser.ServerApplication/MainStartup.cs
View File

@ -1,4 +1,5 @@
using MediaBrowser.Common.Implementations.Logging; using ImageMagickSharp;
using MediaBrowser.Common.Implementations.Logging;
using MediaBrowser.Model.Logging; using MediaBrowser.Model.Logging;
using MediaBrowser.Server.Implementations; using MediaBrowser.Server.Implementations;
using MediaBrowser.Server.Startup.Common; using MediaBrowser.Server.Startup.Common;
@ -40,7 +41,7 @@ namespace MediaBrowser.ServerApplication
var applicationPath = currentProcess.MainModule.FileName; var applicationPath = currentProcess.MainModule.FileName;
ImageMagickSharp.Wand.SetMagickCoderModulePath(Path.Combine(Path.GetDirectoryName(applicationPath), "ImageMagickCoders", "x86")); Wand.SetMagickCoderModulePath(Path.Combine(Path.GetDirectoryName(applicationPath), "ImageMagickCoders", "x86"));
var appPaths = CreateApplicationPaths(applicationPath, _isRunningAsService); var appPaths = CreateApplicationPaths(applicationPath, _isRunningAsService);
var logManager = new NlogManager(appPaths.LogDirectoryPath, "server"); var logManager = new NlogManager(appPaths.LogDirectoryPath, "server");