pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Adding more error handling in dump cmd

Browse source 
The dump cmd did not check the return value of the z.AddFile or
z.AddDir when building the final archive.
It caused the dump command to succeed even if an error occurred.
The resulted dump archive could be corrupted/empty.
(errors could be various: removal by a concurrent process, disk full,
bugs in the dump cmd itself)
This commit is contained in:
kakwa 2015-11-28 12:11:38 +01:00
parent aaa3f1b2b9
commit f86afb04a2
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cmd/dump.go
View file

@ -60,10 +60,18 @@ func runDump(ctx *cli.Context) {
} }
workDir, _ := setting.WorkDir() workDir, _ := setting.WorkDir()
z.AddFile("gogs-repo.zip", path.Join(workDir, "gogs-repo.zip")) if err := z.AddFile("gogs-repo.zip", path.Join(workDir, "gogs-repo.zip")); err !=nil {
z.AddFile("gogs-db.sql", path.Join(workDir, "gogs-db.sql")) log.Fatalf("Fail to include gogs-repo.zip: %v", err)
z.AddDir("custom", path.Join(workDir, "custom")) }
z.AddDir("log", path.Join(workDir, "log")) if err := z.AddFile("gogs-db.sql", path.Join(workDir, "gogs-db.sql")); err !=nil {
log.Fatalf("Fail to include gogs-db.sql: %v", err)
}
if err := z.AddDir("custom", path.Join(workDir, "custom")); err !=nil {
log.Fatalf("Fail to include custom: %v", err)
}
if err := z.AddDir("log", path.Join(workDir, "log")); err !=nil {
log.Fatalf("Fail to include log: %v", err)
}
// FIXME: SSH key file. // FIXME: SSH key file.
if err = z.Close(); err != nil { if err = z.Close(); err != nil {
os.Remove(fileName) os.Remove(fileName)