thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Set default log path if empty during install

Browse source
This commit is contained in:
Josh Frye 2016-02-12 10:03:04 -05:00
parent 1feecd6beb
commit ec478b4b06
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
routers/install.go
View file

@ -242,6 +242,16 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {
return return
} }
// Set default log path if empty.
workDir, err := setting.WorkDir()
if err != nil {
log.Fatal(4, "Fail to get work directory: %v", err)
}
if len(form.LogRootPath) == 0 {
form.LogRootPath = path.Join(workDir, "log")
}
// Test log root path. // Test log root path.
form.LogRootPath = strings.Replace(form.LogRootPath, "\\", "/", -1) form.LogRootPath = strings.Replace(form.LogRootPath, "\\", "/", -1)
if err := os.MkdirAll(form.LogRootPath, os.ModePerm); err != nil { if err := os.MkdirAll(form.LogRootPath, os.ModePerm); err != nil {

4
templates/install.tmpl
View file

@ -109,9 +109,9 @@
<input id="app_url" name="app_url" value="{{.app_url}}" placeholder="e.g. https://try.gogs.io" required> <input id="app_url" name="app_url" value="{{.app_url}}" placeholder="e.g. https://try.gogs.io" required>
<span class="help">{{.i18n.Tr "install.app_url_helper"}}</span> <span class="help">{{.i18n.Tr "install.app_url_helper"}}</span>
</div> </div>
<div class="inline required field"> <div class="inline field">
<label for="log_root_path">{{.i18n.Tr "install.log_root_path"}}</label> <label for="log_root_path">{{.i18n.Tr "install.log_root_path"}}</label>
<input id="log_root_path" name="log_root_path" value="{{.log_root_path}}" placeholder="log" required> <input id="log_root_path" name="log_root_path" value="{{.log_root_path}}" placeholder="log">
<span class="help">{{.i18n.Tr "install.log_root_path_helper"}}</span> <span class="help">{{.i18n.Tr "install.log_root_path_helper"}}</span>
</div> </div>