diff options
author | Unknwon <u@gogs.io> | 2015-11-30 16:18:18 -0500 |
---|---|---|
committer | Unknwon <u@gogs.io> | 2015-11-30 16:18:18 -0500 |
commit | 5a14c3cf9854b2762a82ef6bdd781810380ab666 (patch) | |
tree | 4c9b5121672964134e70ba57f345519962eca4d9 /cmd | |
parent | ca96e04e5fafc179f2b0a5460754e0fb4fe9e2d8 (diff) | |
parent | 1d7a1b6034e9e9a699812196c04cacba0d6eb957 (diff) | |
download | gitea-5a14c3cf9854b2762a82ef6bdd781810380ab666.tar.gz gitea-5a14c3cf9854b2762a82ef6bdd781810380ab666.zip |
Merge pull request #2053 from kakwa/develop
various fixes in gogs dump command
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/dump.go | 43 |
1 files changed, 33 insertions, 10 deletions
diff --git a/cmd/dump.go b/cmd/dump.go index 0bf385d065..90082667bb 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -11,6 +11,8 @@ import ( "path" "time" + "io/ioutil" + "github.com/Unknwon/cae/zip" "github.com/codegangsta/cli" @@ -38,16 +40,23 @@ func runDump(ctx *cli.Context) { models.LoadConfigs() 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) zip.Verbose = ctx.Bool("verbose") - defer os.Remove("gogs-repo.zip") - if err := zip.PackTo(setting.RepoRootPath, "gogs-repo.zip", true); err != nil { + if err := zip.PackTo(setting.RepoRootPath, reposDump, true); err != nil { log.Fatalf("Fail to dump local repositories: %v", err) } log.Printf("Dumping database...") - defer os.Remove("gogs-db.sql") - if err := models.DumpDatabase("gogs-db.sql"); err != nil { + if err := models.DumpDatabase(dbDump); err != nil { 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) } - workDir, _ := setting.WorkDir() - z.AddFile("gogs-repo.zip", path.Join(workDir, "gogs-repo.zip")) - z.AddFile("gogs-db.sql", path.Join(workDir, "gogs-db.sql")) - z.AddDir("custom", path.Join(workDir, "custom")) - z.AddDir("log", path.Join(workDir, "log")) + if err := z.AddFile("gogs-repo.zip", reposDump); err !=nil { + log.Fatalf("Fail to include gogs-repo.zip: %v", err) + } + if err := z.AddFile("gogs-db.sql", dbDump); err !=nil { + 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. if err = z.Close(); err != nil { os.Remove(fileName) 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) } |