Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Check unhandled errors (#128)

Browse source
This commit is contained in:
Matthias Loibl 2016-11-10 11:02:01 +01:00 committed by Andrey Nering
parent 24d7bae2b2
commit 31da225309
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
main.go
View file

@ -8,6 +8,7 @@
package main
import (
"log"
"os"
"runtime"
@ -38,5 +39,5 @@ func main() {
cmd.CmdAdmin,
}
app.Flags = append(app.Flags, []cli.Flag{}...)
app.Run(os.Args)
log.Fatal(app.Run(os.Args))
}

17
routers/install.go
View file

@ -345,7 +345,12 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) {
cfg.Section("security").Key("INSTALL_LOCK").SetValue("true")
cfg.Section("security").Key("SECRET_KEY").SetValue(base.GetRandomString(15))
os.MkdirAll(filepath.Dir(setting.CustomConf), os.ModePerm)
err := os.MkdirAll(filepath.Dir(setting.CustomConf), os.ModePerm)
if err != nil {
ctx.RenderWithErr(ctx.Tr("install.save_config_failed", err), INSTALL, &form)
return
}
if err := cfg.SaveTo(setting.CustomConf); err != nil {
ctx.RenderWithErr(ctx.Tr("install.save_config_failed", err), INSTALL, &form)
return
@ -375,8 +380,14 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) {
}
// Auto-login for admin
ctx.Session.Set("uid", u.ID)
ctx.Session.Set("uname", u.Name)
if err := ctx.Session.Set("uid", u.ID); err != nil {
ctx.RenderWithErr(ctx.Tr("install.save_config_failed", err), INSTALL, &form)
return
}
if err := ctx.Session.Set("uname", u.Name); err != nil {
ctx.RenderWithErr(ctx.Tr("install.save_config_failed", err), INSTALL, &form)
return
}
}
log.Info("First-time run install finished!")