admin: Fix segv when settings.json doesn't exist
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
595318e7b1
commit
68fb332ed1
|
@ -210,18 +210,17 @@ func main() {
|
||||||
os.MkdirAll(settings.SettingsDir, 0777)
|
os.MkdirAll(settings.SettingsDir, 0777)
|
||||||
|
|
||||||
// Initialize settings and load them
|
// Initialize settings and load them
|
||||||
var config *settings.Settings
|
|
||||||
if !settings.ExistsSettings(path.Join(settings.SettingsDir, settings.SettingsFile)) {
|
if !settings.ExistsSettings(path.Join(settings.SettingsDir, settings.SettingsFile)) {
|
||||||
if err = api.ResetSettings(); err != nil {
|
if err = api.ResetSettings(); err != nil {
|
||||||
log.Fatal("Unable to initialize settings.json:", err)
|
log.Fatal("Unable to initialize settings.json:", err)
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
var config *settings.Settings
|
||||||
if config, err = settings.ReadSettings(path.Join(settings.SettingsDir, settings.SettingsFile)); err != nil {
|
if config, err = settings.ReadSettings(path.Join(settings.SettingsDir, settings.SettingsFile)); err != nil {
|
||||||
log.Fatal("Unable to read settings.json:", err)
|
log.Fatal("Unable to read settings.json:", err)
|
||||||
} else {
|
} else {
|
||||||
api.ApplySettings(config)
|
api.ApplySettings(config)
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// Database connection
|
// Database connection
|
||||||
log.Println("Opening database...")
|
log.Println("Opening database...")
|
||||||
|
|
Loading…
Reference in New Issue
Block a user