Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement basic app.ini and path checks to doctor cmd #10064

Merged
merged 13 commits into from
Jan 30, 2020
Merged

Implement basic app.ini and path checks to doctor cmd #10064

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
060bdbe
Add doctor check of app.ini paths
guillep2k Jan 29, 2020
cd0b7b8
Merge branch 'master' into doctor-info
guillep2k Jan 29, 2020
19f67bd
Make /custom dir not mandatory
guillep2k Jan 29, 2020
63fe373
Fix message and improve interface
guillep2k Jan 29, 2020
292909c
Update cmd/doctor.go
guillep2k Jan 29, 2020
56c9afe
Merge branch 'master' into doctor-info
zeripath Jan 29, 2020
3509a7b
Apaise lint
guillep2k Jan 30, 2020
21378c5
Merge branch 'master' into doctor-info
guillep2k Jan 30, 2020
21e1887
Merge branch 'doctor-info' of github.com:guillep2k/gitea into doctor-…
guillep2k Jan 30, 2020
3144375
Isn't the linter a sweet? (1)
guillep2k Jan 30, 2020
61298a6
Isn't the linter a sweet? (2)
guillep2k Jan 30, 2020
f7bf7f7
Isn't the linter a sweet?? (3)
guillep2k Jan 30, 2020
9b0d6fe
Restart CI
guillep2k Jan 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make /custom dir not mandatory
  • Loading branch information
@guillep2k
guillep2k committed Jan 29, 2020
commit 19f67bd227e0b4ea4ac0f9ae4a5b601dd2514327
24 changes: 14 additions & 10 deletions cmd/doctor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,15 @@ func runDoctorPathInfo(ctx *cli.Context) ([]string, error) {

fail := false

check := func(name, path string, is_dir, is_write bool) {
check := func(name, path string, is_dir, required, is_write bool) {
res = append(res, fmt.Sprintf("%-25s '%s'", name+":", path))
if fi, err := os.Stat(path); err != nil {
res = append(res, fmt.Sprintf(" ERROR: %v", err))
fail = true
if required {
res = append(res, fmt.Sprintf(" ERROR: %v", err))
fail = true
} else {
res = append(res, fmt.Sprintf(" NOTICE: not accessible (%v)", err))
}
return
} else if is_dir && !fi.IsDir() {
res = append(res, " ERROR: not a directory")
Expand All @@ -132,16 +136,16 @@ func runDoctorPathInfo(ctx *cli.Context) ([]string, error) {
}

// Note print paths inside quotes to make any leading/trailing spaces evident
check("Configuration File Path", setting.CustomConf, false, false)
check("Repository Root Path", setting.RepoRootPath, true, true)
check("Data Root Path", setting.AppDataPath, true, true)
check("Custom File Root Path", setting.CustomPath, true, false)
check("Work directory", setting.AppWorkPath, true, false)
check("Log Root Path", setting.LogRootPath, true, true)
check("Configuration File Path", setting.CustomConf, false, true, false)
check("Repository Root Path", setting.RepoRootPath, true, true, true)
check("Data Root Path", setting.AppDataPath, true, true, true)
check("Custom File Root Path", setting.CustomPath, true, false, false)
check("Work directory", setting.AppWorkPath, true, true, false)
check("Log Root Path", setting.LogRootPath, true, true, true)

if options.IsDynamic() {
// Do not check/report on StaticRootPath if data is embedded in Gitea (-tags bindata)
check("Static File Root Path", setting.StaticRootPath, true, false)
check("Static File Root Path", setting.StaticRootPath, true, true, false)
}

if fail {
Expand Down