Merge pull request #2053 from kakwa/develop

various fixes in gogs dump command
This commit is contained in:
Unknwon 2015-11-30 16:18:18 -05:00
commit 5a14c3cf98

View file

@ -11,6 +11,8 @@ import (
"path" "path"
"time" "time"
"io/ioutil"
"github.com/Unknwon/cae/zip" "github.com/Unknwon/cae/zip"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
@ -38,16 +40,23 @@ func runDump(ctx *cli.Context) {
models.LoadConfigs() models.LoadConfigs()
models.SetEngine() models.SetEngine()
TmpWorkDir, err := ioutil.TempDir(os.TempDir(), "gogs-dump-")
if err != nil {
log.Fatalf("Fail to create tmp work directory: %v", err)
}
log.Printf("Creating tmp work dir: %s", TmpWorkDir)
reposDump := path.Join(TmpWorkDir, "gogs-repo.zip")
dbDump := path.Join(TmpWorkDir, "gogs-db.sql")
log.Printf("Dumping local repositories...%s", setting.RepoRootPath) log.Printf("Dumping local repositories...%s", setting.RepoRootPath)
zip.Verbose = ctx.Bool("verbose") zip.Verbose = ctx.Bool("verbose")
defer os.Remove("gogs-repo.zip") if err := zip.PackTo(setting.RepoRootPath, reposDump, true); err != nil {
if err := zip.PackTo(setting.RepoRootPath, "gogs-repo.zip", true); err != nil {
log.Fatalf("Fail to dump local repositories: %v", err) log.Fatalf("Fail to dump local repositories: %v", err)
} }
log.Printf("Dumping database...") log.Printf("Dumping database...")
defer os.Remove("gogs-db.sql") if err := models.DumpDatabase(dbDump); err != nil {
if err := models.DumpDatabase("gogs-db.sql"); err != nil {
log.Fatalf("Fail to dump database: %v", err) log.Fatalf("Fail to dump database: %v", err)
} }
@ -59,16 +68,30 @@ func runDump(ctx *cli.Context) {
log.Fatalf("Fail to create %s: %v", fileName, err) log.Fatalf("Fail to create %s: %v", fileName, err)
} }
workDir, _ := setting.WorkDir() if err := z.AddFile("gogs-repo.zip", reposDump); err !=nil {
z.AddFile("gogs-repo.zip", path.Join(workDir, "gogs-repo.zip")) log.Fatalf("Fail to include gogs-repo.zip: %v", err)
z.AddFile("gogs-db.sql", path.Join(workDir, "gogs-db.sql")) }
z.AddDir("custom", path.Join(workDir, "custom")) if err := z.AddFile("gogs-db.sql", dbDump); err !=nil {
z.AddDir("log", path.Join(workDir, "log")) log.Fatalf("Fail to include gogs-db.sql: %v", err)
}
customDir, err := os.Stat(setting.CustomPath)
if err == nil && customDir.IsDir() {
if err := z.AddDir("custom", setting.CustomPath); err !=nil {
log.Fatalf("Fail to include custom: %v", err)
}
} else {
log.Printf("Custom dir %s doesn't exist, skipped", setting.CustomPath)
}
if err := z.AddDir("log", setting.LogRootPath); 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)
log.Fatalf("Fail to save %s: %v", fileName, err) log.Fatalf("Fail to save %s: %v", fileName, err)
} }
log.Println("Finish dumping!") log.Printf("Removing tmp work dir: %s", TmpWorkDir)
os.RemoveAll(TmpWorkDir)
log.Printf("Finish dumping in file %s", fileName)
} }