makary/writefreely
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #126 from writeas/config-improvements

Browse source 
Always initialize database after --config
This commit is contained in:
Matt Baer 2019-06-27 09:31:58 -04:00 • committed by GitHub
commit bb0be02b4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app.go
View file

@ -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,