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

Merge branch 'master' into feature/files

Browse Source
This commit is contained in:
pavelbannov 2020-06-29 15:47:15 +03:00
commit 2d711a9f85
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/services/ASC.Data.Backup/Core/NotifyHelper.cs
View File

@ -155,8 +155,10 @@ namespace ASC.Data.Backup
{
public static DIHelper AddNotifyHelperService(this DIHelper services)
{
services.TryAddSingleton<NotifyHelper>();
services.TryAddSingleton<NotifyHelper>();
return services
.AddStudioNotifySourceService()
.AddUserManagerService()
.AddStudioNotifyHelperService()
.AddDisplayUserSettingsService();

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

@ -429,6 +429,7 @@ namespace ASC.Data.Backup.Service
}
IsCompleted = true;
backupWorker.PublishProgress(this);
}
catch (Exception error)
{
@ -438,6 +439,15 @@ namespace ASC.Data.Backup.Service
}
finally
{
try
{
backupWorker.PublishProgress(this);
}
catch (Exception error)
{
Log.Error("publish", error);
}
try
{
if (!(storagePath == tempFile && StorageType == BackupStorageType.Local))
@ -563,9 +573,12 @@ namespace ASC.Data.Backup.Service
Percentage = 75;
backupWorker.PublishProgress(this);
File.Delete(tempFile);
Percentage = 100;
backupWorker.PublishProgress(this);
}
catch (Exception error)
{
@ -580,6 +593,15 @@ namespace ASC.Data.Backup.Service
}
finally
{
try
{
backupWorker.PublishProgress(this);
}
catch (Exception error)
{
Log.Error("publish", error);
}
if (File.Exists(tempFile))
{
File.Delete(tempFile);
@ -671,6 +693,7 @@ namespace ASC.Data.Backup.Service
Link = GetLink(alias, false);
notifyHelper.SendAboutTransferComplete(tenant, TargetRegion, Link, !Notify);
backupWorker.PublishProgress(this);
}
catch (Exception error)
{
@ -682,6 +705,15 @@ namespace ASC.Data.Backup.Service
}
finally
{
try
{
backupWorker.PublishProgress(this);
}
catch (Exception error)
{
Log.Error("publish", error);
}
if (File.Exists(tempFile))
{
File.Delete(tempFile);