MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup S3 support; send actual backup details in response

Browse Source
This commit is contained in:
Dane Everitt
2020-05-09 19:24:30 -07:00
parent 326b5b6554
commit 0bd28a4480
4 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/backup.go
View File

@@ -86,7 +86,8 @@ func (s *Server) Backup(b backup.BackupInterface) error {
return errors.WithStack(err)
}
if err := b.Generate(inc, s.Filesystem.Path()); err != nil {
ad, err := b.Generate(inc, s.Filesystem.Path())
if err != nil {
if notifyError := s.notifyPanelOfBackup(b.Identifier(), &backup.ArchiveDetails{}, false); notifyError != nil {
zap.S().Warnw("failed to notify panel of failed backup state", zap.String("backup", b.Identifier()), zap.Error(err))
}
@@ -96,7 +97,6 @@ func (s *Server) Backup(b backup.BackupInterface) error {
// Try to notify the panel about the status of this backup. If for some reason this request
// fails, delete the archive from the daemon and return that error up the chain to the caller.
ad := b.Details()
if notifyError := s.notifyPanelOfBackup(b.Identifier(), ad, true); notifyError != nil {
b.Remove()