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

Add some missing error handling, fix a few typos

Browse Source
This commit is contained in:
Matthew Penner 2020-07-15 13:11:12 -06:00
parent b64f1897fb
commit f4c10e5a23
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/backup/archiver.go
View File

@ -20,9 +20,9 @@ type Archive struct {
Files *IncludedFiles Files *IncludedFiles
} }
// Creates an archive at dest with all of the files definied in the included files struct. // Creates an archive at dst with all of the files defined in the included files struct.
func (a *Archive) Create(dest string, ctx context.Context) (os.FileInfo, error) { func (a *Archive) Create(dst string, ctx context.Context) (os.FileInfo, error) {
f, err := os.OpenFile(dest, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600) f, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -66,14 +66,17 @@ func (a *Archive) Create(dest string, ctx context.Context) (os.FileInfo, error)
// Attempt to remove the archive if there is an error, report that error to // Attempt to remove the archive if there is an error, report that error to
// the logger if it fails. // the logger if it fails.
if rerr := os.Remove(dest); rerr != nil && !os.IsNotExist(rerr) { if rerr := os.Remove(dst); rerr != nil && !os.IsNotExist(rerr) {
log.WithField("location", dest).Warn("failed to delete corrupted backup archive") log.WithField("location", dst).Warn("failed to delete corrupted backup archive")
} }
return nil, err return nil, err
} }
st, _ := f.Stat() st, err := f.Stat()
if err != nil {
return nil, err
}
return st, nil return st, nil
} }
@ -101,7 +104,7 @@ func (a *Archive) addToArchive(p string, s *os.FileInfo, w *tar.Writer) error {
a.Lock() a.Lock()
defer a.Unlock() defer a.Unlock()
if err = w.WriteHeader(header); err != nil { if err := w.WriteHeader(header); err != nil {
return err return err
} }

2
server/filesystem.go
View File

@ -677,7 +677,7 @@ func (fs *Filesystem) GetIncludedFiles(dir string, ignored []string) (*backup.In
return inc, nil return inc, nil
} }
// Compresses all of the files matching the given paths in the specififed directory. This function // Compresses all of the files matching the given paths in the specified directory. This function
// also supports passing nested paths to only compress certain files and folders when working in // also supports passing nested paths to only compress certain files and folders when working in
// a larger directory. This effectively creates a local backup, but rather than ignoring specific // a larger directory. This effectively creates a local backup, but rather than ignoring specific
// files and folders, it takes an allow-list of files and folders. // files and folders, it takes an allow-list of files and folders.