offen/docker-volume-backup
2
0
Fork 0
mirror of https://github.com/offen/docker-volume-backup.git synced 2024-11-25 06:30:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

display all error messages instead of first one

Browse Source
This commit is contained in:
Frederik Ring 2021-08-29 19:39:51 +02:00
parent aae97a5617
commit ede94bcd88
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
cmd/backup/main.go
View File

@ -5,11 +5,13 @@ package main
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"io" "io"
"os" "os"
"path" "path"
"path/filepath" "path/filepath"
"strings"
"time" "time"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
@ -191,7 +193,7 @@ func (s *script) stopContainers() (func() error, error) {
stopError = fmt.Errorf( stopError = fmt.Errorf(
"stopContainersAndRun: %d error(s) stopping containers: %w", "stopContainersAndRun: %d error(s) stopping containers: %w",
len(stopErrors), len(stopErrors),
err, join(stopErrors...),
) )
} }
@ -237,7 +239,7 @@ func (s *script) stopContainers() (func() error, error) {
return fmt.Errorf( return fmt.Errorf(
"stopContainersAndRun: %d error(s) restarting containers and services: %w", "stopContainersAndRun: %d error(s) restarting containers and services: %w",
len(restartErrors), len(restartErrors),
err, join(restartErrors...),
) )
} }
s.logger.Infof( s.logger.Infof(
@ -376,18 +378,18 @@ func (s *script) pruneOldBackups() error {
close(objectsCh) close(objectsCh)
}() }()
errChan := s.mc.RemoveObjects(context.Background(), s.c.AwsS3BucketName, objectsCh, minio.RemoveObjectsOptions{}) errChan := s.mc.RemoveObjects(context.Background(), s.c.AwsS3BucketName, objectsCh, minio.RemoveObjectsOptions{})
var errors []error var removeErrors []error
for result := range errChan { for result := range errChan {
if result.Err != nil { if result.Err != nil {
errors = append(errors, result.Err) removeErrors = append(removeErrors, result.Err)
} }
} }
if len(errors) != 0 { if len(removeErrors) != 0 {
return fmt.Errorf( return fmt.Errorf(
"pruneOldBackups: %d error(s) removing files from remote storage: %w", "pruneOldBackups: %d error(s) removing files from remote storage: %w",
len(errors), len(removeErrors),
errors[0], join(removeErrors...),
) )
} }
s.logger.Infof( s.logger.Infof(
@ -434,17 +436,17 @@ func (s *script) pruneOldBackups() error {
} }
if len(matches) != 0 && len(matches) != len(candidates) { if len(matches) != 0 && len(matches) != len(candidates) {
var errors []error var removeErrors []error
for _, candidate := range matches { for _, candidate := range matches {
if err := os.Remove(candidate); err != nil { if err := os.Remove(candidate); err != nil {
errors = append(errors, err) removeErrors = append(removeErrors, err)
} }
} }
if len(errors) != 0 { if len(removeErrors) != 0 {
return fmt.Errorf( return fmt.Errorf(
"pruneOldBackups: %d error(s) deleting local files, starting with: %w", "pruneOldBackups: %d error(s) deleting local files, starting with: %w",
len(errors), len(removeErrors),
errors[0], join(removeErrors...),
) )
} }
s.logger.Infof( s.logger.Infof(
@ -509,3 +511,18 @@ func copy(src, dst string) error {
} }
return out.Close() return out.Close()
} }
// join takes a list of errors and joins them into a single error
func join(errs ...error) error {
if len(errs) == 1 {
return errs[0]
}
var msgs []string
for _, err := range errs {
if err == nil {
continue
}
msgs = append(msgs, err.Error())
}
return errors.New("[" + strings.Join(msgs, ", ") + "]")
}