fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

Make go vet -strictshadow mostly happy

Browse source
This commit is contained in:
nemunaire 2019-01-17 16:55:54 +01:00
parent 75463dcebb
commit 8749a7c164
7 changed files with 38 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

17
admin/main.go
View file

@ -164,7 +164,7 @@ func main() {
// Initialize settings and load them
if !settings.ExistsSettings(path.Join(settings.SettingsDir, settings.SettingsFile)) {
if err := settings.SaveSettings(path.Join(settings.SettingsDir, settings.SettingsFile), settings.FICSettings{
if err = settings.SaveSettings(path.Join(settings.SettingsDir, settings.SettingsFile), settings.FICSettings{
Title: "Challenge FIC",
Authors: "Laboratoire SRS, ÉPITA",
FirstBlood: fic.FirstBlood,
@ -177,21 +177,24 @@ func main() {
}); err != nil {
log.Fatal("Unable to initialize settings.json:", err)
}
} else if config, err := settings.ReadSettings(path.Join(settings.SettingsDir, settings.SettingsFile)); err != nil {
log.Fatal("Unable to read settings.json:", err)
} else {
api.ApplySettings(config)
var config settings.FICSettings
if config, err = settings.ReadSettings(path.Join(settings.SettingsDir, settings.SettingsFile)); err != nil {
log.Fatal("Unable to read settings.json:", err)
} else {
api.ApplySettings(config)
}
}
// Database connection
log.Println("Opening database...")
if err := fic.DBInit(*dsn); err != nil {
if err = fic.DBInit(*dsn); err != nil {
log.Fatal("Cannot open the database: ", err)
}
defer fic.DBClose()
log.Println("Creating database...")
if err := fic.DBCreate(); err != nil {
if err = fic.DBCreate(); err != nil {
log.Fatal("Cannot create database: ", err)
}
@ -201,7 +204,7 @@ func main() {
log.Println("Unable to open index.html: ", err)
} else if indexTmpl, err := template.New("index").Parse(indextpl); err != nil {
log.Println("Cannot create template: ", err)
} else if err := indexTmpl.Execute(file, map[string]string{"urlbase": path.Clean(path.Join(*baseURL + "/", "nuke"))[:len(path.Clean(path.Join(*baseURL + "/", "nuke"))) - 4]}); err != nil {
} else if err = indexTmpl.Execute(file, map[string]string{"urlbase": path.Clean(path.Join(*baseURL + "/", "nuke"))[:len(path.Clean(path.Join(*baseURL + "/", "nuke"))) - 4]}); err != nil {
log.Println("An error occurs during template execution: ", err)
}