shoopea/backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

v2 #2

Merged
shoopea merged 29 commits from v2 into master 2023-08-21 20:03:11 +02:00
Conversation 0 Commits 29 Files Changed 65 +11 -9
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 24a5e6676f - Show all commits

12
app.go
View File

@ -230,11 +230,13 @@ func (a *App) SanityCheck() error {
onlineDestinations++ onlineDestinations++
for _, src := range a.sources { for _, src := range a.sources {
dest2 := dest.Append("/" + src.Box() + "/" + src.Path()) dest2 := dest.Append("/" + src.Box() + "/" + src.Path())
for _, s := range b.zfs.filesystems[dest2.Path()].snapshots { if fs, ok := b.zfs.filesystems[dest2.Path()]; ok {
if !s.Valid() { for _, s := range fs.snapshots {
if err := s.Delete(); err != nil { if !s.Valid() {
log.WithFields(log.Fields{"app": a.name, "box": src.Box(), "snapshot": s.String(), "call": "Delete", "error": err}).Errorf("") if err := s.Delete(); err != nil {
return err log.WithFields(log.Fields{"app": a.name, "box": src.Box(), "snapshot": s.String(), "call": "Delete", "error": err}).Errorf("")
return err
}
} }
} }
} }

8
version.go
View File

@ -1,7 +1,7 @@
// Code generated by version.sh (@generated) DO NOT EDIT. // Code generated by version.sh (@generated) DO NOT EDIT.
package main package main
var githash = "db05789" var githash = "e07c1c4"
var branch = "v2" var branch = "v2"
var buildstamp = "2023-07-01_12:10:14" var buildstamp = "2023-07-01_20:33:58"
var commits = "64" var commits = "65"
var version = "db05789-b64 - 2023-07-01_12:10:14" var version = "e07c1c4-b65 - 2023-07-01_20:33:58"