IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/backup.core

Browse Source
This commit is contained in:
Anton Suhorukov 2021-08-31 17:58:07 +03:00
commit b4c5edfa21
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
products/ASC.Files/Core/Configuration/FilesSettings.cs
View File

@ -31,7 +31,8 @@ using ASC.Common;
using ASC.Core;
using ASC.Core.Common.Settings;
using ASC.Files.Core;
using ASC.Web.Studio.Core;
namespace ASC.Web.Files.Classes
{
[Serializable]
@ -114,12 +115,14 @@ namespace ASC.Web.Files.Classes
public class FilesSettingsHelper
{
private SettingsManager SettingsManager { get; }
private CoreBaseSettings CoreBaseSettings { get; }
public FilesSettingsHelper(SettingsManager settingsManager, CoreBaseSettings coreBaseSettings)
private CoreBaseSettings CoreBaseSettings { get; }
private SetupInfo SetupInfo { get; }
public FilesSettingsHelper(SettingsManager settingsManager, CoreBaseSettings coreBaseSettings, SetupInfo setupInfo)
{
SettingsManager = settingsManager;
CoreBaseSettings = coreBaseSettings;
CoreBaseSettings = coreBaseSettings;
SetupInfo = setupInfo;
}
public bool ConfirmDelete
@ -285,6 +288,11 @@ namespace ASC.Web.Files.Classes
get => LoadForCurrentUser().DownloadTarGzSetting;
}
public long ChunkUploadSize
{
get => SetupInfo.ChunkUploadSize;
}
private FilesSettings LoadForCurrentUser()
{
return SettingsManager.LoadForCurrentUser<FilesSettings>();

7
products/ASC.Files/Server/Program.cs
View File

@ -24,7 +24,7 @@ namespace ASC.Files
await host.RunAsync();
}
public static IHostBuilder CreateHostBuilder(string[] args) =>
public static IHostBuilder CreateHostBuilder(string[] args) =>
Host.CreateDefaultBuilder(args)
.UseSystemd()
.UseWindowsService()
@ -35,6 +35,11 @@ namespace ASC.Files
builder.ConfigureKestrel((hostingContext, serverOptions) =>
{
serverOptions.Limits.MaxRequestBodySize = 100 * 1024 * 1024;
serverOptions.Limits.MaxRequestBufferSize = 100 * 1024 * 1024;
serverOptions.Limits.MinRequestBodyDataRate = null;
serverOptions.Limits.MinResponseDataRate = null;
var kestrelConfig = hostingContext.Configuration.GetSection("Kestrel");
if (!kestrelConfig.Exists()) return;

2
web/ASC.Web.Core/SetupInfo.cs
View File

@ -153,7 +153,7 @@ namespace ASC.Web.Studio.Core
AvailableFileSize = GetAppSettings("web.available-file-size", 100L * 1024L * 1024L);
TeamlabSiteRedirect = GetAppSettings("web.teamlab-site", string.Empty);
ChunkUploadSize = GetAppSettings("files.uploader.chunk-size", 5 * 1024 * 1024);
ChunkUploadSize = GetAppSettings("files:uploader:chunk-size", 10 * 1024 * 1024);
ThirdPartyAuthEnabled = string.Equals(GetAppSettings("web.thirdparty-auth", "true"), "true");
ThirdPartyBannerEnabled = string.Equals(GetAppSettings("web.thirdparty-banner", "false"), "true");
NoTenantRedirectURL = GetAppSettings("web.notenant-url", "");