mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Only create admin user specified in config file when there are no users in the database, Fixes #1680
This commit is contained in:
parent
36110d0977
commit
a96e4a343c
@ -33,24 +33,29 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func EnsureAdminUser() {
|
func EnsureAdminUser() {
|
||||||
adminQuery := m.GetUserByLoginQuery{LoginOrEmail: setting.AdminUser}
|
statsQuery := m.GetSystemStatsQuery{}
|
||||||
|
|
||||||
if err := bus.Dispatch(&adminQuery); err == m.ErrUserNotFound {
|
if err := bus.Dispatch(&statsQuery); err != nil {
|
||||||
cmd := m.CreateUserCommand{}
|
log.Fatal(3, "Could not determine if admin user exists: %v", err)
|
||||||
cmd.Login = setting.AdminUser
|
return
|
||||||
cmd.Email = setting.AdminUser + "@localhost"
|
|
||||||
cmd.Password = setting.AdminPassword
|
|
||||||
cmd.IsAdmin = true
|
|
||||||
|
|
||||||
if err = bus.Dispatch(&cmd); err != nil {
|
|
||||||
log.Error(3, "Failed to create default admin user", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
log.Info("Created default admin user: %v", setting.AdminUser)
|
|
||||||
} else if err != nil {
|
|
||||||
log.Error(3, "Could not determine if admin user exists: %v", err)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if statsQuery.Result.UserCount > 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd := m.CreateUserCommand{}
|
||||||
|
cmd.Login = setting.AdminUser
|
||||||
|
cmd.Email = setting.AdminUser + "@localhost"
|
||||||
|
cmd.Password = setting.AdminPassword
|
||||||
|
cmd.IsAdmin = true
|
||||||
|
|
||||||
|
if err := bus.Dispatch(&cmd); err != nil {
|
||||||
|
log.Error(3, "Failed to create default admin user", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Info("Created default admin user: %v", setting.AdminUser)
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewEngine() {
|
func NewEngine() {
|
||||||
|
Loading…
Reference in New Issue
Block a user