diff options
| author | Bond-009 <bond.009@outlook.com> | 2021-04-11 13:33:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-11 13:33:42 +0200 |
| commit | f0625bb023b67f557802c8089c73b3e98859f3d3 (patch) | |
| tree | 2652fe8a4957961681b2a12abd995ce4b50b43ea | |
| parent | 240e67d48568e1bedddd1658a68e0dac0a2f8699 (diff) | |
| parent | 01491796a285a621c6aebe4f886ee74413e5fbee (diff) | |
Merge pull request #5769 from cvium/workstation-gc
Enable Workstation GC mode
| -rw-r--r-- | Jellyfin.Server/Jellyfin.Server.csproj | 1 | ||||
| -rw-r--r-- | debian/conf/jellyfin | 5 | ||||
| -rw-r--r-- | fedora/jellyfin.env | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/Jellyfin.Server/Jellyfin.Server.csproj b/Jellyfin.Server/Jellyfin.Server.csproj index e7f83aff1..98d990344 100644 --- a/Jellyfin.Server/Jellyfin.Server.csproj +++ b/Jellyfin.Server/Jellyfin.Server.csproj @@ -9,6 +9,7 @@ <AssemblyName>jellyfin</AssemblyName> <OutputType>Exe</OutputType> <TargetFramework>net5.0</TargetFramework> + <ServerGarbageCollection>false</ServerGarbageCollection> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateDocumentationFile>true</GenerateDocumentationFile> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> diff --git a/debian/conf/jellyfin b/debian/conf/jellyfin index 7cbfa88ee..9ebaf2bd8 100644 --- a/debian/conf/jellyfin +++ b/debian/conf/jellyfin @@ -33,6 +33,11 @@ JELLYFIN_FFMPEG_OPT="--ffmpeg=/usr/lib/jellyfin-ffmpeg/ffmpeg" # [OPTIONAL] run Jellyfin without the web app #JELLYFIN_NOWEBAPP_OPT="--nowebclient" +# [OPTIONAL] run Jellyfin with ASP.NET Server Garbage Collection (uses more RAM and less CPU than Workstation GC) +# 0 = Workstation +# 1 = Server +#COMPlus_gcServer=1 + # # SysV init/Upstart options # diff --git a/fedora/jellyfin.env b/fedora/jellyfin.env index bf64acd3f..56b7a3558 100644 --- a/fedora/jellyfin.env +++ b/fedora/jellyfin.env @@ -35,3 +35,7 @@ JELLYFIN_RESTART_OPT="--restartpath=/usr/libexec/jellyfin/restart.sh" # [OPTIONAL] run Jellyfin without the web app #JELLYFIN_NOWEBAPP_OPT="--noautorunwebapp" +# [OPTIONAL] run Jellyfin with ASP.NET Server Garbage Collection (uses more RAM and less CPU than Workstation GC) +# 0 = Workstation +# 1 = Server +#COMPlus_gcServer=1 |