Skip to content

Commit 2b0e4e0

Browse files
Rychu-Pawellafriks
authored andcommitted
Fixed errors logging in dump.go (#9218)
* Fixed errors logging in dump.go * Replaced overlooked log.Fatal() with fatal() * Run make fmt on dump.go * Added missing new line to the fatal log * Run make fmt on dump.go
1 parent 412679f commit 2b0e4e0

File tree

1 file changed

+32
-26
lines changed

1 file changed

+32
-26
lines changed

cmd/dump.go

+32-26
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ package cmd
88
import (
99
"fmt"
1010
"io/ioutil"
11-
"log"
1211
"os"
1312
"path"
1413
"path/filepath"
1514
"time"
1615

1716
"code.gitea.io/gitea/models"
17+
"code.gitea.io/gitea/modules/log"
1818
"code.gitea.io/gitea/modules/setting"
1919

2020
"github.com/unknwon/cae/zip"
@@ -55,6 +55,11 @@ It can be used for backup and capture Gitea server image to send to maintainer`,
5555
},
5656
}
5757

58+
func fatal(format string, args ...interface{}) {
59+
fmt.Fprintf(os.Stderr, format+"\n", args...)
60+
log.Fatal(format, args...)
61+
}
62+
5863
func runDump(ctx *cli.Context) error {
5964
setting.NewContext()
6065
setting.NewServices() // cannot access session settings otherwise
@@ -66,13 +71,13 @@ func runDump(ctx *cli.Context) error {
6671

6772
tmpDir := ctx.String("tempdir")
6873
if _, err := os.Stat(tmpDir); os.IsNotExist(err) {
69-
log.Fatalf("Path does not exist: %s", tmpDir)
74+
fatal("Path does not exist: %s", tmpDir)
7075
}
7176
tmpWorkDir, err := ioutil.TempDir(tmpDir, "gitea-dump-")
7277
if err != nil {
73-
log.Fatalf("Failed to create tmp work directory: %v", err)
78+
fatal("Failed to create tmp work directory: %v", err)
7479
}
75-
log.Printf("Creating tmp work dir: %s", tmpWorkDir)
80+
log.Info("Creating tmp work dir: %s", tmpWorkDir)
7681

7782
// work-around #1103
7883
if os.Getenv("TMPDIR") == "" {
@@ -82,88 +87,89 @@ func runDump(ctx *cli.Context) error {
8287
dbDump := path.Join(tmpWorkDir, "gitea-db.sql")
8388

8489
fileName := ctx.String("file")
85-
log.Printf("Packing dump files...")
90+
log.Info("Packing dump files...")
8691
z, err := zip.Create(fileName)
8792
if err != nil {
88-
log.Fatalf("Failed to create %s: %v", fileName, err)
93+
fatal("Failed to create %s: %v", fileName, err)
8994
}
95+
9096
zip.Verbose = ctx.Bool("verbose")
9197

9298
if ctx.IsSet("skip-repository") {
93-
log.Printf("Skip dumping local repositories")
99+
log.Info("Skip dumping local repositories")
94100
} else {
95-
log.Printf("Dumping local repositories...%s", setting.RepoRootPath)
101+
log.Info("Dumping local repositories...%s", setting.RepoRootPath)
96102
reposDump := path.Join(tmpWorkDir, "gitea-repo.zip")
97103
if err := zip.PackTo(setting.RepoRootPath, reposDump, true); err != nil {
98-
log.Fatalf("Failed to dump local repositories: %v", err)
104+
fatal("Failed to dump local repositories: %v", err)
99105
}
100106
if err := z.AddFile("gitea-repo.zip", reposDump); err != nil {
101-
log.Fatalf("Failed to include gitea-repo.zip: %v", err)
107+
fatal("Failed to include gitea-repo.zip: %v", err)
102108
}
103109
}
104110

105111
targetDBType := ctx.String("database")
106112
if len(targetDBType) > 0 && targetDBType != setting.Database.Type {
107-
log.Printf("Dumping database %s => %s...", setting.Database.Type, targetDBType)
113+
log.Info("Dumping database %s => %s...", setting.Database.Type, targetDBType)
108114
} else {
109-
log.Printf("Dumping database...")
115+
log.Info("Dumping database...")
110116
}
111117

112118
if err := models.DumpDatabase(dbDump, targetDBType); err != nil {
113-
log.Fatalf("Failed to dump database: %v", err)
119+
fatal("Failed to dump database: %v", err)
114120
}
115121

116122
if err := z.AddFile("gitea-db.sql", dbDump); err != nil {
117-
log.Fatalf("Failed to include gitea-db.sql: %v", err)
123+
fatal("Failed to include gitea-db.sql: %v", err)
118124
}
119125

120126
if len(setting.CustomConf) > 0 {
121-
log.Printf("Adding custom configuration file from %s", setting.CustomConf)
127+
log.Info("Adding custom configuration file from %s", setting.CustomConf)
122128
if err := z.AddFile("app.ini", setting.CustomConf); err != nil {
123-
log.Fatalf("Failed to include specified app.ini: %v", err)
129+
fatal("Failed to include specified app.ini: %v", err)
124130
}
125131
}
126132

127133
customDir, err := os.Stat(setting.CustomPath)
128134
if err == nil && customDir.IsDir() {
129135
if err := z.AddDir("custom", setting.CustomPath); err != nil {
130-
log.Fatalf("Failed to include custom: %v", err)
136+
fatal("Failed to include custom: %v", err)
131137
}
132138
} else {
133-
log.Printf("Custom dir %s doesn't exist, skipped", setting.CustomPath)
139+
log.Info("Custom dir %s doesn't exist, skipped", setting.CustomPath)
134140
}
135141

136142
if com.IsExist(setting.AppDataPath) {
137-
log.Printf("Packing data directory...%s", setting.AppDataPath)
143+
log.Info("Packing data directory...%s", setting.AppDataPath)
138144

139145
var sessionAbsPath string
140146
if setting.SessionConfig.Provider == "file" {
141147
sessionAbsPath = setting.SessionConfig.ProviderConfig
142148
}
143149
if err := zipAddDirectoryExclude(z, "data", setting.AppDataPath, sessionAbsPath); err != nil {
144-
log.Fatalf("Failed to include data directory: %v", err)
150+
fatal("Failed to include data directory: %v", err)
145151
}
146152
}
147153

148154
if err := z.AddDir("log", setting.LogRootPath); err != nil {
149-
log.Fatalf("Failed to include log: %v", err)
155+
fatal("Failed to include log: %v", err)
150156
}
151157

152158
if err = z.Close(); err != nil {
153159
_ = os.Remove(fileName)
154-
log.Fatalf("Failed to save %s: %v", fileName, err)
160+
fatal("Failed to save %s: %v", fileName, err)
155161
}
156162

157163
if err := os.Chmod(fileName, 0600); err != nil {
158-
log.Printf("Can't change file access permissions mask to 0600: %v", err)
164+
log.Info("Can't change file access permissions mask to 0600: %v", err)
159165
}
160166

161-
log.Printf("Removing tmp work dir: %s", tmpWorkDir)
167+
log.Info("Removing tmp work dir: %s", tmpWorkDir)
162168

163169
if err := os.RemoveAll(tmpWorkDir); err != nil {
164-
log.Fatalf("Failed to remove %s: %v", tmpWorkDir, err)
170+
fatal("Failed to remove %s: %v", tmpWorkDir, err)
165171
}
166-
log.Printf("Finish dumping in file %s", fileName)
172+
log.Info("Finish dumping in file %s", fileName)
167173

168174
return nil
169175
}

0 commit comments

Comments
 (0)