starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 05:53:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into library_scan_speed

Browse Source
This commit is contained in:
Gary Wilber
2020-11-08 11:51:40 -08:00
parent a51adec836 363d41f943
commit e6d8c02944
400 changed files with 5814 additions and 8346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -271,6 +271,10 @@ namespace MediaBrowser.Model.Configuration
/// </summary>
public string[] KnownProxies { get; set; }
/// Gets or sets the number of days we should retain activity logs.
/// </summary>
public int? ActivityLogRetentionDays { get; set; }
/// <summary>
/// Gets or sets the how the library scan fans out.
/// </summary>
@@ -391,8 +395,9 @@ namespace MediaBrowser.Model.Configuration
SlowResponseThresholdMs = 500;
CorsHosts = new[] { "*" };
KnownProxies = Array.Empty<string>();
LibraryMetadataRefreshConcurrency = 0;
ActivityLogRetentionDays = 30;
LibraryScanFanoutConcurrency = 0;
LibraryMetadataRefreshConcurrency = 0;
}
}