Always initialize database after --config

Previously, this would only run when configuring an instance for
single-user usage. Now it'll also run when configuring for multi-user
usage.

It also adds a log when the database has already been initialized.
pull/128/head
Matt Baer 6 years ago committed by Michael Demetriou
parent a102f97c3e
commit 8d9f60aaa9
  1. 24
      app.go

@ -449,19 +449,21 @@ func DoConfig(app *App) {
log.Error("Unable to configure: %v", err) log.Error("Unable to configure: %v", err)
os.Exit(1) os.Exit(1)
} }
if d.User != nil { app.cfg = d.Config
app.cfg = d.Config connectToDatabase(app)
connectToDatabase(app) defer shutdown(app)
defer shutdown(app)
if !app.db.DatabaseInitialized() {
if !app.db.DatabaseInitialized() { err = adminInitDatabase(app)
err = adminInitDatabase(app) if err != nil {
if err != nil { log.Error(err.Error())
log.Error(err.Error()) os.Exit(1)
os.Exit(1)
}
} }
} else {
log.Info("Database already initialized.")
}
if d.User != nil {
u := &User{ u := &User{
Username: d.User.Username, Username: d.User.Username,
HashedPass: d.User.HashedPass, HashedPass: d.User.HashedPass,

Loading…
Cancel
Save