mirror of
https://github.com/writefreely/writefreely
synced 2024-11-24 17:43:05 +00:00
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.
This commit is contained in:
parent
a102f97c3e
commit
8d9f60aaa9
1 changed files with 12 additions and 10 deletions
22
app.go
22
app.go
|
@ -449,19 +449,21 @@ func DoConfig(app *App) {
|
|||
log.Error("Unable to configure: %v", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
if d.User != nil {
|
||||
app.cfg = d.Config
|
||||
connectToDatabase(app)
|
||||
defer shutdown(app)
|
||||
app.cfg = d.Config
|
||||
connectToDatabase(app)
|
||||
defer shutdown(app)
|
||||
|
||||
if !app.db.DatabaseInitialized() {
|
||||
err = adminInitDatabase(app)
|
||||
if err != nil {
|
||||
log.Error(err.Error())
|
||||
os.Exit(1)
|
||||
}
|
||||
if !app.db.DatabaseInitialized() {
|
||||
err = adminInitDatabase(app)
|
||||
if err != nil {
|
||||
log.Error(err.Error())
|
||||
os.Exit(1)
|
||||
}
|
||||
} else {
|
||||
log.Info("Database already initialized.")
|
||||
}
|
||||
|
||||
if d.User != nil {
|
||||
u := &User{
|
||||
Username: d.User.Username,
|
||||
HashedPass: d.User.HashedPass,
|
||||
|
|
Loading…
Reference in a new issue