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

Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup

Browse Source
This commit is contained in:
Tatiana Lopaeva 2021-06-02 17:04:12 +03:00
commit cc073f46e3
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/ASC.Data.Storage/Configuration/StorageSettings.cs
View File

@ -136,6 +136,7 @@ namespace ASC.Data.Storage.Configuration
private SettingsManager SettingsManager { get; } private SettingsManager SettingsManager { get; }
private IHttpContextAccessor HttpContextAccessor { get; } private IHttpContextAccessor HttpContextAccessor { get; }
private ConsumerFactory ConsumerFactory { get; } private ConsumerFactory ConsumerFactory { get; }
private IServiceProvider ServiceProvider { get; }
public StorageSettingsHelper( public StorageSettingsHelper(
BaseStorageSettingsListener baseStorageSettingsListener, BaseStorageSettingsListener baseStorageSettingsListener,
@ -145,7 +146,8 @@ namespace ASC.Data.Storage.Configuration
IOptionsMonitor<ILog> options, IOptionsMonitor<ILog> options,
TenantManager tenantManager, TenantManager tenantManager,
SettingsManager settingsManager, SettingsManager settingsManager,
ConsumerFactory consumerFactory) ConsumerFactory consumerFactory,
IServiceProvider serviceProvider)
{ {
baseStorageSettingsListener.Subscribe(); baseStorageSettingsListener.Subscribe();
StorageFactoryConfig = storageFactoryConfig; StorageFactoryConfig = storageFactoryConfig;
@ -155,6 +157,7 @@ namespace ASC.Data.Storage.Configuration
TenantManager = tenantManager; TenantManager = tenantManager;
SettingsManager = settingsManager; SettingsManager = settingsManager;
ConsumerFactory = consumerFactory; ConsumerFactory = consumerFactory;
ServiceProvider = serviceProvider;
} }
public StorageSettingsHelper( public StorageSettingsHelper(
BaseStorageSettingsListener baseStorageSettingsListener, BaseStorageSettingsListener baseStorageSettingsListener,
@ -165,8 +168,9 @@ namespace ASC.Data.Storage.Configuration
TenantManager tenantManager, TenantManager tenantManager,
SettingsManager settingsManager, SettingsManager settingsManager,
IHttpContextAccessor httpContextAccessor, IHttpContextAccessor httpContextAccessor,
ConsumerFactory consumerFactory) ConsumerFactory consumerFactory,
: this(baseStorageSettingsListener, storageFactoryConfig, pathUtils, cache, options, tenantManager, settingsManager, consumerFactory) IServiceProvider serviceProvider)
: this(baseStorageSettingsListener, storageFactoryConfig, pathUtils, cache, options, tenantManager, settingsManager, consumerFactory, serviceProvider)
{ {
HttpContextAccessor = httpContextAccessor; HttpContextAccessor = httpContextAccessor;
} }
@ -221,8 +225,7 @@ namespace ASC.Data.Storage.Configuration
if (DataStoreConsumer(baseStorageSettings).HandlerType == null) return null; if (DataStoreConsumer(baseStorageSettings).HandlerType == null) return null;
return dataStore = ((IDataStore) return dataStore = ((IDataStore)ServiceProvider.GetService(DataStoreConsumer(baseStorageSettings).HandlerType))
Activator.CreateInstance(DataStoreConsumer(baseStorageSettings).HandlerType, TenantManager, PathUtils, HttpContextAccessor, Options))
.Configure(TenantManager.GetCurrentTenant().TenantId.ToString(), null, null, DataStoreConsumer(baseStorageSettings)); .Configure(TenantManager.GetCurrentTenant().TenantId.ToString(), null, null, DataStoreConsumer(baseStorageSettings));
} }
} }

16
common/services/ASC.Data.Backup/Service/BackupWorker.cs
View File

@ -343,7 +343,21 @@ namespace ASC.Data.Backup.Service
private string StorageBasePath { get; set; } private string StorageBasePath { get; set; }
public bool BackupMail { get; set; } public bool BackupMail { get; set; }
public Dictionary<string, string> StorageParams { get; set; } public Dictionary<string, string> StorageParams { get; set; }
public string Link { get; private set; }
private string link;
public string Link
{
get
{
return link ?? GetProperty<string>(nameof(link));
}
set
{
link = value;
SetProperty(nameof(link), value);
}
}
public string TempFolder { get; set; } public string TempFolder { get; set; }
private string CurrentRegion { get; set; } private string CurrentRegion { get; set; }
private Dictionary<string, string> ConfigPaths { get; set; } private Dictionary<string, string> ConfigPaths { get; set; }